Ticket #15929: 15929.diff

django/contrib/auth/middleware.py

@@ -13 +13 @@
 class AuthenticationMiddleware(object):
     def process_request(self, request):
         assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
-        request.__class__.user = LazyUser()
+
+        # We dynamically subclass request.__class__ rather than monkey patch the
+        # original class.
+        class RequestWithUser(request.__class__):
+            user = LazyUser()
+
+        request.__class__ = RequestWithUser
         return None
 
 

tests/regressiontests/test_client_regress/models.py

@@ -12 +12 @@
     Context, Template, loader)
 import django.template.context
 from django.test import Client, TestCase
-from django.test.client import encode_file
+from django.test.client import encode_file, RequestFactory
 from django.test.utils import ContextList
 
 
@@ -908 +908 @@
             response = self.client.get("/test_client_regress/raw_post_data/")
         except AssertionError:
             self.fail("Accessing request.raw_post_data from a view fetched with GET by the test client shouldn't fail.")
+
+
+class RequestFactoryStateTest(TestCase):
+    """Regression tests for #15929."""
+
+    def setUp(self):
+        self.factory = RequestFactory()
+
+    def common_test_that_should_always_pass(self):
+        request = self.factory.get('/')
+        request.session = {}
+        self.assertFalse(hasattr(request, 'user'))
+
+    def test_request(self):
+        self.common_test_that_should_always_pass()
+
+    def test_request_after_client(self):
+        # apart from the next line the three tests are identical
+        self.client.get('/')
+        self.common_test_that_should_always_pass() # Shouldn't fail
+
+    def test_request_after_client_2(self):
+        # This test is executed after the previous one
+        self.common_test_that_should_always_pass() # Shouldn't fail