Context Navigation

Ticket #13222: 13222.patch

File 13222.patch, 1.5 KB (added by Aymeric Augustin, 12 years ago)

diff --git a/django/http/response.py b/django/http/response.py
index 4a5c479..49145cd 100644

                class HttpResponse(HttpResponseBase):
         else:
             self._container = [value]
             self._base_content_is_iter = False
+        self._iterator = iter(self._container)
     def __iter__(self):
-        self._iterator = iter(self._container)
         return self
     def __next__(self):
-…
+               class HttpResponse(HttpResponseBase):
     def tell(self):
         if self._base_content_is_iter:
             raise Exception("This %s instance cannot tell its position" % self.__class__.__name__)
         return sum([len(chunk) for chunk in self])
+        return len(self.content)
 class StreamingHttpResponse(HttpResponseBase):

diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py
index bfb4ae1..803cbf0 100644

                class HttpResponseTests(unittest.TestCase):
         self.assertRaises(UnicodeEncodeError,
                           getattr, r, 'content')
+    def test_iterator_isnt_rewound(self):
+        # Regression test for #13222
+        r = HttpResponse('abc')
+        i = iter(r)
+        self.assertEqual(list(i), [b'abc'])
+        self.assertEqual(list(i), [])
     def test_file_interface(self):
         r = HttpResponse()
         r.write(b"hello")