summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-09-16 02:03:46 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-09-16 02:03:46 +0000
commitae75958820e344357ea716fcdbd5e56f06a00b24 (patch)
tree70b418bd72995d31fc58858fe87a2a97c8fa5923
parentd0f4e52abfecf38239d399c04223b7ce00aba962 (diff)
Fixed #5501 -- Fixed Python 2.3 and 2.4 incompatibility. Thanks, brosner.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/sessions/backends/file.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/django/contrib/sessions/backends/file.py b/django/contrib/sessions/backends/file.py
index 062acca323..221db5cc60 100644
--- a/django/contrib/sessions/backends/file.py
+++ b/django/contrib/sessions/backends/file.py
@@ -31,11 +31,12 @@ class SessionStore(SessionBase):
try:
session_file = open(self._key_to_file(), "rb")
try:
- session_data = self.decode(session_file.read())
- except(EOFError, SuspiciousOperation):
- self._session_key = self._get_new_session_key()
- self._session_cache = {}
- self.save()
+ try:
+ session_data = self.decode(session_file.read())
+ except(EOFError, SuspiciousOperation):
+ self._session_key = self._get_new_session_key()
+ self._session_cache = {}
+ self.save()
finally:
session_file.close()
except(IOError):
@@ -64,4 +65,4 @@ class SessionStore(SessionBase):
pass
def clean(self):
- pass \ No newline at end of file
+ pass