Ticket #13222: httpresponse.diff

django/http/__init__.py

@@ -371 +371 @@
     content = property(_get_content, _set_content)
 
     def __iter__(self):
-        self._iterator = iter(self._container)
-        return self
-
-    def next(self):
-        chunk = self._iterator.next()
-        if isinstance(chunk, unicode):
-            chunk = chunk.encode(self._charset)
-        return str(chunk)
+        for chunk in self._container:
+            if isinstance(chunk, unicode):
+                chunk = chunk.encode(self._charset)
+            yield str(chunk)
 
     def close(self):
         if hasattr(self._container, 'close'):

tests/regressiontests/httpwrappers/tests.py

@@ -463 +463 @@
 >>> x.update(y)
 >>> x.getlist('a')
 [u'1', u'2', u'3', u'4']
+
+#
+# Regression test for #13222: HttpResponse iteration
+#
+>>> it = iter(HttpResponse("foobar"))
+>>> list(it), list(it)
+(['foobar'], [])
 """
 
 from django.http import QueryDict, HttpResponse