Ticket #3224: refactor-response-middleware.diff

django/test/client.py

@@ -25 +25 @@
         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)
 

django/core/handlers/wsgi.py

@@ -187 +187 @@
         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)
 

django/core/handlers/base.py

@@ -49 +49 @@
                 self._exception_middleware.insert(0, mw_instance.process_exception)
 
     def get_response(self, request):
+        response = self.get_response_aux(request)
+        
+        # Apply response middleware
+        for middleware_method in self._response_middleware:
+            response = middleware_method(request, response)
+        return response
+
+    def get_response_aux(self, request):
         "Returns an HttpResponse object for the given HttpRequest"
         from django.core import exceptions, urlresolvers
         from django.core.mail import mail_admins

django/core/handlers/modpython.py

@@ -148 +148 @@
         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)