Merge lp:~vila/bzr/1184021 into lp:bzr

[Vincent Ladeuil]

Add __iter__ to http ResponseFile

Tests for jelmer's fix for bug #1184021, as straight forward than the fix so I'll just let jelmer approve and land ;)

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/tests/test_http_response.py'
--- bzrlib/tests/test_http_response.py	2012-08-04 11:16:14 +0000
+++ bzrlib/tests/test_http_response.py	2013-05-24 23:55:31 +0000
@@ -75,6 +75,17 @@
         pass
 
 
+class TestResponseFileIter(tests.TestCase):
+
+    def test_iter_empty(self):
+        f = response.ResponseFile('empty', StringIO())
+        self.assertEqual([], list(f))
+
+    def test_iter_many(self):
+        f = response.ResponseFile('many', StringIO('0\n1\nboo!\n'))
+        self.assertEqual(['0\n', '1\n', 'boo!\n'], list(f))
+
+
 class TestHTTPConnection(tests.TestCase):
 
     def test_cleanup_pipe(self):
@@ -137,7 +148,6 @@
 
     def test_read_zero(self):
         f = self._file
-        start = self.first_range_start
         self.assertEquals('', f.read(0))
         f.seek(10, 1)
         self.assertEquals('', f.read(0))
@@ -371,13 +381,11 @@
 
     def test_seek_across_ranges(self):
         f = self._file
-        start = self.first_range_start
         f.seek(126) # skip the two first ranges
         self.assertEquals('AB', f.read(2))
 
     def test_checked_read_dont_overflow_buffers(self):
         f = self._file
-        start = self.first_range_start
         # We force a very low value to exercise all code paths in _checked_read
         f._discarded_buf_size = 8
         f.seek(126) # skip the two first ranges
 
=== modified file 'bzrlib/transport/http/response.py'
--- bzrlib/transport/http/response.py	2012-04-06 11:38:05 +0000
+++ bzrlib/transport/http/response.py	2013-05-24 23:55:31 +0000
@@ -38,6 +38,7 @@
     """A wrapper around the http socket containing the result of a GET request.
 
     Only read() and seek() (forward) are supported.
+
     """
     def __init__(self, path, infile):
         """Constructor.
@@ -71,6 +72,13 @@
         self._pos += len(data)
         return data
 
+    def __iter__(self):
+        while True:
+            line = self.readline()
+            if not line:
+                return
+            yield line
+
     def tell(self):
         return self._pos