Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #894 -- Moved response middleware call to base.py so that excep…

…tions in that middleware get processed by the standard exception handling. As a nice side effect, this cuts down on a bit of redundant code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2c443df341984b1fc8c6801e39129180588309a0 1 parent 53ca15c
Adrian Holovaty adrianholovaty authored
4 django/core/handlers/base.py
View
@@ -86,6 +86,10 @@ def get_response(self, path, request):
if response is None:
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:
if DEBUG:
4 django/core/handlers/modpython.py
View
@@ -144,10 +144,6 @@ def __call__(self, req):
finally:
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)
return 0 # mod_python.apache.OK
4 django/core/handlers/wsgi.py
View
@@ -160,10 +160,6 @@ def __call__(self, environ, start_response):
finally:
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]
except KeyError:
Please sign in to comment.
Something went wrong with that request. Please try again.