Ticket #4650: response-wrapping.patch

django/core/handlers/wsgi.py

@@ -174 +174 @@
     REQUEST = property(_get_request)
     raw_post_data = property(_get_raw_post_data)
 
+class IterConsumedSignal(object):
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        dispatcher.send(signal=signals.request_finished)
+        raise StopIteration()
+IterConsumedSignal = IterConsumedSignal()
+
+class ResponseWrapper(object):
+
+    def __init__(self, response):
+        self._response = response
+        if hasattr(self._response, 'close'):
+            self.close = self._response.close
+
+    def __iter__(self):
+        assert self._response is not None
+        try:
+            if isinstance(self._response, basestring):
+                return chain([self._response], IterConsumedSignal)
+            return chain(self._response, IterConsumedSignal)
+        finally:
+            self._response = None
+
+
 class WSGIHandler(BaseHandler):
     def __call__(self, environ, start_response):
         from django.conf import settings
@@ -192 +219 @@
             for middleware_method in self._response_middleware:
                 response = middleware_method(request, response)
 
-        finally:
+        except:
             dispatcher.send(signal=signals.request_finished)
+            raise
 
         try:
             status_text = STATUS_CODE_TEXT[response.status_code]
@@ -204 +232 @@
         for c in response.cookies.values():
             response_headers.append(('Set-Cookie', c.output(header='')))
         start_response(status, response_headers)
-        return response
+        return ResponseWrapper(response)