Ticket #13090: 13090.1.diff

django/core/handlers/base.py

@@ -70 +70 @@
 
         try:
             try:
-                # Reset the urlconf for this thread.
-                urlresolvers.set_urlconf(None)
-                # Obtain a default resolver. It's needed early for handling 404's.
-                resolver = urlresolvers.RegexURLResolver(r'^/', None)
+                # Setup default url resolver for this thread.
+                urlconf = settings.ROOT_URLCONF
+                urlresolvers.set_urlconf(urlconf)
+                resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
 
                 # Apply request middleware
                 for middleware_method in self._request_middleware:
@@ -81 +81 @@
                     if response:
                         return response
 
-                # Get urlconf from request object, if available.  Otherwise use default.
-                urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
-                # Set the urlconf for this thread to the one specified above.
-                urlresolvers.set_urlconf(urlconf)
-                # Reset the resolver with a possibly new urlconf
-                resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
+                if hasattr(request, "urlconf"):
+                    # Reset url resolver with a custom urlconf.
+                    urlconf = request.urlconf
+                    urlresolvers.set_urlconf(urlconf)
+                    resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
 
                 callback, callback_args, callback_kwargs = resolver.resolve(
                         request.path_info)

tests/regressiontests/middleware_exceptions/tests.py

@@ -3 +3 @@
 from django.test import TestCase
 from django.core.signals import got_request_exception
 
-class RequestMiddleware(object):
-    def process_request(self, request):
-        raise Exception('Exception')
 
-class MiddlewareExceptionTest(TestCase):
-    def setUp(self):
-        self.exceptions = []
-        got_request_exception.connect(self._on_request_exception)
-        self.client.handler.load_middleware()
+class RequestException(Exception):
+    pass
 
-    def tearDown(self):
-        got_request_exception.disconnect(self._on_request_exception)
-        self.exceptions = []
 
-    def _on_request_exception(self, sender, request, **kwargs):
-        self.exceptions.append(sys.exc_info())
+class RequestMiddleware(object):
+    def process_request(self, request):
+        raise RequestException('Exception')
 
+
+class MiddlewareExceptionTest(TestCase):
     def test_process_request(self):
+        self.client.handler.load_middleware()
         self.client.handler._request_middleware.insert(0, RequestMiddleware().process_request)
-        try:
-            response = self.client.get('/')
-        except:
-            # Test client indefinitely re-raises any exceptions being raised
-            # during request handling. Hence actual testing that exception was
-            # properly handled is done by relying on got_request_exception
-            # signal being sent.
-            pass
-        self.assertEquals(len(self.exceptions), 1)
-        exception, value, tb = self.exceptions[0]
-        self.assertEquals(value.args, ('Exception', ))
+        self.assertRaises(RequestException, self.client.get, '/')