From 46871eb1bb37e0c34f4498e671f6418f9487d69f Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 23 Mar 2012 09:32:11 +0000 Subject: [PATCH] Fixed an incompatibility with Python 2.5 in the changes done in r17795. Refs #17810. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17796 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/sessions/backends/cache.py | 3 ++- django/contrib/sessions/backends/cached_db.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/django/contrib/sessions/backends/cache.py b/django/contrib/sessions/backends/cache.py index ac6647e110..7c3eecd425 100644 --- a/django/contrib/sessions/backends/cache.py +++ b/django/contrib/sessions/backends/cache.py @@ -3,6 +3,7 @@ from django.core.cache import cache KEY_PREFIX = "django.contrib.sessions.cache" + class SessionStore(SessionBase): """ A cache-based session store. @@ -18,7 +19,7 @@ class SessionStore(SessionBase): def load(self): try: session_data = self._cache.get(self.cache_key, None) - except Exception as e: + except Exception, e: e_type = str(type(e)) if e_type != "": raise e diff --git a/django/contrib/sessions/backends/cached_db.py b/django/contrib/sessions/backends/cached_db.py index 20804c85f6..db0d3515b1 100644 --- a/django/contrib/sessions/backends/cached_db.py +++ b/django/contrib/sessions/backends/cached_db.py @@ -8,6 +8,7 @@ from django.core.cache import cache KEY_PREFIX = "django.contrib.sessions.cached_db" + class SessionStore(DBStore): """ Implements cached, database backed sessions. @@ -23,7 +24,7 @@ class SessionStore(DBStore): def load(self): try: data = cache.get(self.cache_key, None) - except Exception as e: + except Exception, e: e_type = str(type(e)) if e_type != "": raise e