Changeset 2358

Timestamp:

02/18/06 17:41:17 (3 years ago)

Author:

adrian

Message:

Fixed #894 -- Moved response middleware call to base.py so that exceptions in that middleware get processed by the standard exception handling. As a nice side effect, this cuts down on a bit of redundant code.

Files:

• django/trunk/django/core/handlers/base.py (modified) (1 diff)
• django/trunk/django/core/handlers/modpython.py (modified) (1 diff)
• django/trunk/django/core/handlers/wsgi.py (modified) (1 diff)

django/trunk/django/core/handlers/base.py

@@ -87 +87 @@
-                raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, callback.func_name)
-
+            # Apply response middleware
+            for middleware_method in self._response_middleware:
+                response = middleware_method(request, response)
+
-            return response
-        except exceptions.Http404, e:

django/trunk/django/core/handlers/modpython.py

@@ -145 +145 @@
-            db.db.close()
-
-        # Apply response middleware
-        for middleware_method in self._response_middleware:
-            response = middleware_method(request, response)
-
-        # Convert our custom HttpResponse object back into the mod_python req.
-        populate_apache_request(response, req)

django/trunk/django/core/handlers/wsgi.py

@@ -161 +161 @@
-            db.db.close()
-
-        # Apply response middleware
-        for middleware_method in self._response_middleware:
-            response = middleware_method(request, response)
-
-        try:
-            status_text = STATUS_CODE_TEXT[response.status_code]