Rev 3069: Jam's review feedback. in file:///v/home/vila/src/bzr/bugs/173010/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/173010/

------------------------------------------------------------
revno: 3069
revision-id:v.ladeuil+lp at free.fr-20071204082624-14qyieeefm13zm7b
parent: v.ladeuil+lp at free.fr-20071203203305-pd0a61a7c4hkcajn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 173010
timestamp: Tue 2007-12-04 09:26:24 +0100
message:
  Jam's review feedback.
  
  * bzrlib/transport/http/response.py:
  (RangeFile.set_range_from_header): Catch ValueError only.
  
  * bzrlib/transport/http/__init__.py:
  (HttpTransportBase._readv, HttpTransportBase._coalesce_readv):
  'file' is a builtin use rfile instead.
  
  * bzrlib/tests/test_transport_implementations.py:
  (TransportTests.test_get): Use izip.
modified:
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
-------------- next part --------------
=== modified file 'bzrlib/tests/test_transport_implementations.py'
--- a/bzrlib/tests/test_transport_implementations.py	2007-12-03 08:33:06 +0000
+++ b/bzrlib/tests/test_transport_implementations.py	2007-12-04 08:26:24 +0000
@@ -190,12 +190,12 @@
         # Use itertools.imap() instead of use zip() or map(), since they fully
         # evaluate their inputs, the transport requests should be issued and
         # handled sequentially (we don't want to force transport to buffer).
-        for content, f in itertools.imap(None, contents, content_f):
+        for content, f in itertools.izip(contents, content_f):
             self.assertEqual(content, f.read())
 
         content_f = t.get_multi(iter(files))
         # Use itertools.imap() for the same reason
-        for content, f in itertools.imap(None, contents, content_f):
+        for content, f in itertools.izip(contents, content_f):
             self.assertEqual(content, f.read())
 
         self.assertRaises(NoSuchFile, t.get, 'c')

=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py	2007-12-03 17:53:35 +0000
+++ b/bzrlib/transport/http/__init__.py	2007-12-04 08:26:24 +0000
@@ -253,12 +253,12 @@
             cur_offset_and_size = iter_offsets.next()
 
             try:
-                for cur_coal, file in self._coalesce_readv(relpath, coalesced):
+                for cur_coal, rfile in self._coalesce_readv(relpath, coalesced):
                     # Split the received chunk
                     for offset, size in cur_coal.ranges:
                         start = cur_coal.start + offset
-                        file.seek(start, 0)
-                        data = file.read(size)
+                        rfile.seek(start, 0)
+                        data = rfile.read(size)
                         data_len = len(data)
                         if data_len != size:
                             raise errors.ShortReadvError(relpath, start, size,
@@ -307,9 +307,9 @@
             # Note that the following may raise errors.InvalidHttpRange. It's
             # the caller responsability to decide how to retry since it may
             # provide different coalesced offsets.
-            code, file = self._get(relpath, ranges)
+            code, rfile = self._get(relpath, ranges)
             for range in ranges:
-                yield range, file
+                yield range, rfile
 
     def recommended_page_size(self):
         """See Transport.recommended_page_size().

=== modified file 'bzrlib/transport/http/response.py'
--- a/bzrlib/transport/http/response.py	2007-12-03 17:53:35 +0000
+++ b/bzrlib/transport/http/response.py	2007-12-04 08:26:24 +0000
@@ -118,7 +118,7 @@
         """Create a new range from its description in the headers"""
         try:
             rtype, values = content_range.split()
-        except:
+        except ValueError:
             raise errors.InvalidHttpRange(self._path, content_range,
                                           "Malformed Content-Range header '%s'"
                                           % content_range)
@@ -133,7 +133,7 @@
             start, end = start_end.split('-')
             start = int(start)
             end = int(end)
-        except:
+        except ValueError:
             raise errors.InvalidHttpRange(self._path, content_range,
                                           "Invalid range values '%s'" % values)
         size = end - start + 1