From cfdfb1088b59b06e79c1b9684cb3197ab270dee6 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Wed, 10 May 2006 04:30:09 +0000 Subject: [PATCH] multi-auth: Updated middleware to use new auth api. git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@2886 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/middleware.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/django/contrib/auth/middleware.py b/django/contrib/auth/middleware.py index 4b3ed54960..5630f7ea81 100644 --- a/django/contrib/auth/middleware.py +++ b/django/contrib/auth/middleware.py @@ -4,12 +4,8 @@ class LazyUser(object): def __get__(self, request, obj_type=None): if self._user is None: - from django.contrib.auth.models import User, AnonymousUser, SESSION_KEY - try: - user_id = request.session[SESSION_KEY] - self._user = User.objects.get(pk=user_id) - except (KeyError, User.DoesNotExist): - self._user = AnonymousUser() + from django.contrib.auth import get_user + self._user = get_user(request) return self._user class AuthenticationMiddleware: