Ticket #6269: bettererrorpage.diff

base.py

@@ -58 +58 @@
         from django.core import exceptions, urlresolvers
         from django.core.mail import mail_admins
         from django.conf import settings
+        try:
+            # Apply request middleware
+            for middleware_method in self._request_middleware:
+                response = middleware_method(request)
+                if response:
+                    return response
 
-        # Apply request middleware
-        for middleware_method in self._request_middleware:
-            response = middleware_method(request)
-            if response:
-                return response
+            # Get urlconf from request object, if available.  Otherwise use default.
+            urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
 
-        # Get urlconf from request object, if available.  Otherwise use default.
-        urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
+            resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
 
-        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
-        try:
             callback, callback_args, callback_kwargs = resolver.resolve(request.path)
 
             # Apply view middleware