Ticket #15671: no-hasattr2.diff

django/contrib/auth/tests/remote_user.py

@@ -1 +1 @@
 from datetime import datetime
 
 from django.conf import settings
+from django.contrib.auth import middleware
 from django.contrib.auth.backends import RemoteUserBackend
 from django.contrib.auth.models import User
 from django.test import TestCase
@@ -92 +93 @@
         response = self.client.get('/remote_user/', REMOTE_USER=self.known_user)
         self.assertEqual(default_login, response.context['user'].last_login)
 
+    def test_raises_exceptions(self):
+        """
+        The exception raised by a failure when checking for request.user should
+        bubble up.
+        """
+        class BrokenLazyUser(object):
+            def __get__(self, request, obj_type=None):
+                raise TypeError
+        curr_lazy_user = middleware.LazyUser
+        middleware.LazyUser = BrokenLazyUser
+        try:
+            self.assertRaises(TypeError, self.client.get, '/remote_user/',
+                              REMOTE_USER=self.known_user)
+        finally:
+            middleware.LazyUser = curr_lazy_user
+
     def tearDown(self):
         """Restores settings to avoid breaking other tests."""
         settings.MIDDLEWARE_CLASSES = self.curr_middleware

django/contrib/auth/middleware.py

@@ -38 +38 @@
 
     def process_request(self, request):
         # AuthenticationMiddleware is required so that request.user exists.
-        if not hasattr(request, 'user'):
+        try:
+            request.user
+        except AttributeError:
             raise ImproperlyConfigured(
                 "The Django remote user auth middleware requires the"
                 " authentication middleware to be installed.  Edit your"