Commit 46871eb1 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

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
parent 2ca98019

django/contrib/sessions/backends/cache.py

+2 −1
Original line number Diff line number Diff line
@@ -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 != "<class 'memcache.MemcachedKeyLengthError'>":

                raise e

django/contrib/sessions/backends/cached_db.py

+2 −1
Original line number Diff line number Diff line
@@ -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 != "<class 'memcache.MemcachedKeyLengthError'>":

                raise e