Merge lp:~jelmer/bzr/readline-size into lp:bzr

[Jelmer Vernooij]

This adds a size argument to _ReportingFileSocket.readline().

This fixes the use of http on Python 2.7. I haven't checked on Python 2.4 and 2.5 yet, we might have to add some conditionals. :-/

[Martin Packman (gz)]

It seems pretty clear from vila's comment that you deleted that merging this will break 2.4 and 2.5 so...

review: Needs Fixing

[Vincent Ladeuil (vila)]

Well, I thought the comment was clear enough that we *can't* do what your propose or break python2.[45] compatibility.

So we *need* conditionals.

What is more disturbing though, is that we don't have a test failing for python2.7...

[Vincent Ladeuil (vila)]

Grrr *vote* damn it *vote* ! Comments implying NeedsFixing without spelling it out are sooo annoying !

<cough> sorry, ranting against myself here, but still :)

review: Needs Fixing

[Vincent Ladeuil (vila)]

Superseded by https://code.edge.launchpad.net/~vila/bzr/2.2-693880-ssl-readline/+merge/44671

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py	2010-10-18 10:01:47 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py	2010-12-23 19:36:17 +0000
@@ -110,13 +110,8 @@
         self.report_activity(len(s), 'read')
         return s
 
-    def readline(self):
-        # This should be readline(self, size=-1), but httplib in python 2.4 and
-        #  2.5 defines a SSLFile wrapper whose readline method lacks the size
-        #  parameter.  So until we drop support for 2.4 and 2.5 and since we
-        #  don't *need* the size parameter we'll stay with readline(self)
-        #  --  vila 20090209
-        s = self.filesock.readline()
+    def readline(self, size=-1):
+        s = self.filesock.readline(size)
         self.report_activity(len(s), 'read')
         return s
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2010-12-21 10:12:37 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2010-12-23 19:36:17 +0000
@@ -55,6 +55,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* _ReportingFileSocket.readline() now accepts a size argument. This fixes
+   http access on Python2.7. (Jelmer Vernooij, #693880)
+
 Documentation
 *************