diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py index 1520bd3be2..59909fb803 100644 --- a/django/core/handlers/modpython.py +++ b/django/core/handlers/modpython.py @@ -103,7 +103,7 @@ class ModPythonRequest(httpwrappers.HttpRequest): if not user_id: raise ValueError self._user = User.objects.get_object(pk=user_id) - except (AttributeError, KeyError, ValueError, user.DoesNotExist): + except (AttributeError, KeyError, ValueError, User.DoesNotExist): from django.parts.auth import anonymoususers self._user = anonymoususers.AnonymousUser() return self._user diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index c9d5011c3f..1f5d5ea2d3 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -124,7 +124,7 @@ class WSGIRequest(httpwrappers.HttpRequest): if not user_id: raise ValueError self._user = User.objects.get_object(pk=user_id) - except (AttributeError, KeyError, ValueError, user.DoesNotExist): + except (AttributeError, KeyError, ValueError, User.DoesNotExist): from django.parts.auth import anonymoususers self._user = anonymoususers.AnonymousUser() return self._user diff --git a/django/models/core.py b/django/models/core.py index 33ac1808e8..99c617065e 100644 --- a/django/models/core.py +++ b/django/models/core.py @@ -81,12 +81,12 @@ class SessionManager(models.Manager): session_key = md5.new(str(random.randint(0, sys.maxint - 1)) + SECRET_KEY).hexdigest() try: self.get_object(session_key__exact=session_key) - except SessionDoesNotExist: + except self.klass.DoesNotExist: break return session_key def save(self, session_key, session_dict, expire_date): - s = self.klass(session_key, encode(session_dict), expire_date) + s = self.klass(session_key, self.encode(session_dict), expire_date) if session_dict: s.save() else: