Ticket #13222: httpresponse2.diff

django/http/__init__.py

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

tests/regressiontests/httpwrappers/tests.py

@@ -243 +243 @@
         self.assertRaises(BadHeaderError, r.__setitem__, 'test\rstr', 'test')
         self.assertRaises(BadHeaderError, r.__setitem__, 'test\nstr', 'test')
 
+    def test_iteration(self):
+        r = HttpResponse("foobar")
+        it = iter(r)
+        self.assertEqual(list(it), ["foobar"])
+        self.assertEqual(list(it), [])
+
+        r = HttpResponse(["foo", "bar", "spam", "eggs"])
+        it1 = iter(r)
+        it2 = iter(r)
+        self.assertEqual(zip(it1, it2), [("foo", "foo"), ("bar", "bar"),
+            ("spam", "spam"), ("eggs", "eggs")])
+
 class CookieTests(unittest.TestCase):
     def test_encode(self):
         """