diff options
| -rw-r--r-- | django/contrib/auth/__init__.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py index ed01da94cf..c3a1253564 100644 --- a/django/contrib/auth/__init__.py +++ b/django/contrib/auth/__init__.py @@ -138,15 +138,17 @@ def get_user(request): If no user is retrieved an instance of `AnonymousUser` is returned. """ from .models import AnonymousUser + user = None try: user_id = request.session[SESSION_KEY] backend_path = request.session[BACKEND_SESSION_KEY] - assert backend_path in settings.AUTHENTICATION_BACKENDS - backend = load_backend(backend_path) - user = backend.get_user(user_id) or AnonymousUser() - except (KeyError, AssertionError): - user = AnonymousUser() - return user + except KeyError: + pass + else: + if backend_path in settings.AUTHENTICATION_BACKENDS: + backend = load_backend(backend_path) + user = backend.get_user(user_id) + return user or AnonymousUser() def get_permission_codename(action, opts): |