Ticket #3240: base.py-4290.patch

core/handlers/wsgi.py

@@ -1 +1 @@
 from django.core.handlers.base import BaseHandler
 from django.core import signals
-from django.dispatch import dispatcher
 from django.utils import datastructures
 from django import http
 from pprint import pformat
@@ -176 +175 @@
 
 class WSGIHandler(BaseHandler):
     def __call__(self, environ, start_response):
-        from django.conf import settings
+        request, response = self.dispatch_request(WSGIRequest,environ)
 
-        # Set up middleware if needed. We couldn't do this earlier, because
-        # settings weren't available.
-        if self._request_middleware is None:
-            self.load_middleware()
-
-        dispatcher.send(signal=signals.request_started)
         try:
-            request = WSGIRequest(environ)
-            response = self.get_response(request)
-
-            # Apply response middleware
-            for middleware_method in self._response_middleware:
-                response = middleware_method(request, response)
-
-        finally:
-            dispatcher.send(signal=signals.request_finished)
-
-        try:
             status_text = STATUS_CODE_TEXT[response.status_code]
         except KeyError:
             status_text = 'UNKNOWN STATUS CODE'

core/handlers/base.py

@@ -3 +3 @@
 from django import http
 import sys
 
+def get_traceback(exc_info=None):
+    "Helper function to return the traceback as a string"
+    import traceback
+    return '\n'.join(traceback.format_exception(*(exc_info or sys.exc_info())))
+
+def _500View(request,resolver=None):
+    from django.conf import settings
+    if settings.DEBUG:
+        from django.views import debug
+        return debug.technical_500_response(request, *sys.exc_info())
+    else:
+        from django.core import urlresolvers
+        from django.core.mail import mail_admins
+        if not resolver:
+            resolver = urlresolvers.RegexURLResolver(r'^/', settings.ROOT_URLCONF)
+        # Get the exception info now, in case another exception is thrown later.
+        exc_info = sys.exc_info()
+        receivers = dispatcher.send(signal=signals.got_request_exception)
+        # When DEBUG is False, send an error message to the admins.
+        subject = 'Error (%s IP): %s' % ((request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS and 'internal' or 'EXTERNAL'), request.path)
+        try:
+            request_repr = repr(request)
+        except:
+            request_repr = "Request repr() unavailable"
+        message = "%s\n\n%s" % (get_traceback(exc_info), request_repr)
+        mail_admins(subject, message, fail_silently=True)
+        resolver = urlresolvers.RegexURLResolver(r'^/', settings.ROOT_URLCONF)
+        # Return an HttpResponse that displays a friendly error message.
+        callback, param_dict = resolver.resolve500()
+        return callback(request, **param_dict)
+
 class BaseHandler(object):
     def __init__(self):
         self._request_middleware = self._view_middleware = self._response_middleware = self._exception_middleware = None
@@ -54 +85 @@
         from django.core.mail import mail_admins
         from django.conf import settings
 
-        # 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)
+        resolver = urlresolvers.RegexURLResolver(r'^/', settings.ROOT_URLCONF)
+        try:
+            # Apply request middleware
+            for middleware_method in self._request_middleware:
+                response = middleware_method(request)
+                if response:
+                    return response
 
-        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
-        try:
             callback, callback_args, callback_kwargs = resolver.resolve(request.path)
 
             # Apply view middleware
@@ -106 +135 @@
         except SystemExit:
             pass # See http://code.djangoproject.com/ticket/1023
         except: # Handle everything else, including SuspiciousOperation, etc.
-            if settings.DEBUG:
-                from django.views import debug
-                return debug.technical_500_response(request, *sys.exc_info())
-            else:
-                # Get the exception info now, in case another exception is thrown later.
-                exc_info = sys.exc_info()
-                receivers = dispatcher.send(signal=signals.got_request_exception)
-                # When DEBUG is False, send an error message to the admins.
-                subject = 'Error (%s IP): %s' % ((request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS and 'internal' or 'EXTERNAL'), request.path)
-                try:
-                    request_repr = repr(request)
-                except:
-                    request_repr = "Request repr() unavailable"
-                message = "%s\n\n%s" % (self._get_traceback(exc_info), request_repr)
-                mail_admins(subject, message, fail_silently=True)
-                # Return an HttpResponse that displays a friendly error message.
-                callback, param_dict = resolver.resolve500()
-                return callback(request, **param_dict)
+            return _500View(request)
 
-    def _get_traceback(self, exc_info=None):
-        "Helper function to return the traceback as a string"
-        import traceback
-        return '\n'.join(traceback.format_exception(*(exc_info or sys.exc_info())))
+    def _get_traceback(self,exc_info=None):
+        return get_traceback(exc_info)
+
+    def dispatch_request(self,handle_request,*args,**kwd):
+        from django.conf import settings
+
+        # Set up middleware if needed. We couldn't do this earlier, because
+        # settings weren't available.
+        if self._request_middleware is None:
+            self.load_middleware()
+
+        dispatcher.send(signal=signals.request_started)
+        try:
+            request = handle_request(*args,**kwd)
+            response = self.get_response(request)
+
+            try:
+                # Apply response middleware
+                for middleware_method in self._response_middleware:
+                    response = middleware_method(request, response)
+            except:
+                from django.core.handlers.base import _500View
+                response = _500View(request)
+
+        finally:
+            dispatcher.send(signal=signals.request_finished)
+        return request, response

core/handlers/modpython.py

@@ -135 +135 @@
     def __call__(self, req):
         # mod_python fakes the environ, and thus doesn't process SetEnv.  This fixes that
         os.environ.update(req.subprocess_env)
+        request, response = self.dispatch_request(ModPythonRequest,req)
 
-        # now that the environ works we can see the correct settings, so imports
-        # that use settings now can work
-        from django.conf import settings
-
-        # if we need to set up middleware, now that settings works we can do it now.
-        if self._request_middleware is None:
-            self.load_middleware()
-
-        dispatcher.send(signal=signals.request_started)
-        try:
-            request = ModPythonRequest(req)
-            response = self.get_response(request)
-
-            # Apply response middleware
-            for middleware_method in self._response_middleware:
-                response = middleware_method(request, response)
-
-        finally:
-            dispatcher.send(signal=signals.request_finished)
-
         # Convert our custom HttpResponse object back into the mod_python req.
         req.content_type = response['Content-Type']
         for key, value in response.headers.items():