Merge lp:~vila/bzr/2.2-693880-ssl-readline into lp:bzr/2.2

[Vincent Ladeuil]

Fix https compatibility with python2.7

Bug #693880 broke the workaround describe in the patch (I won't copy it here :).

This came with the dev version that recently landed in natty.

Long story short, this is somewhat critical as it breaks https access, so the sooner we land it the better.

Since the patch is small, I targeted 2.2 so we won't have to backport in a hurry if people upgrade to python2.7 while using a stable version, but I think we may have released 2.3 when the corresponding change is released in python.

The most likely to encounter this problem are early natty adopters, so I'll make sure this get included in 2.3b5 asap and may release it on 2011-01-06 as previously planned.

I've tested this fix on babune again python 2.4, 2.5 and 2.7 and locally on 2.6.

[lp:~vila/bzr/2.2-693880-ssl-readline]

5119. By Vincent Ladeuil on 2010-12-24

Clarify the fix intent.

[Jelmer Vernooij (jelmer)]

Thanks for fixing this!

An inline comment explaining why this hack is necessary (and mentioning SSLFile) would be nice.

review: Approve (code)

[Vincent Ladeuil (vila)]

sent to pqm by email

[Martin Packman (gz)]

Test? I didn't get any complaint about this code locally, not sure if that means it's untested or if it's not exercised without paramiko or something.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/24/2010 11:22 AM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/2.2-693880-ssl-readline into lp:bzr/2.2.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/2.2-693880-ssl-readline/+merge/44671
>
> Bug #693880 broke the workaround describe in the patch (I won't copy it here :).
>
> This came with the dev version that recently landed in natty.
>
> Long story short, this is somewhat critical as it breaks https access, so the sooner we land it the better.
>
> Since the patch is small, I targeted 2.2 so we won't have to backport in a hurry if people upgrade to python2.7 while using a stable version, but I think we may have released 2.3 when the corresponding change is released in python.
>
> The most likely to encounter this problem are early natty adopters, so I'll make sure this get included in 2.3b5 asap and may release it on 2011-01-06 as previously planned.
>
> I've tested this fix on babune again python 2.4, 2.5 and 2.7 and locally on 2.6.

It is only missing a comment on why the version check has to exist. (on
version X size is not accepted, in version Y size is being passed by
default.)

Other than that:

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0iMVoACgkQJdeBCYSNAAMlCACg0J1xjHAittp9QhjqiZTkTfoE
5KwAoKfyTKWeTzSrzaaj2O1cFNkIU193
=rrZm
-----END PGP SIGNATURE-----

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-12-16 16:03:26 +0000
+++ NEWS	2010-12-24 17:39:11 +0000
@@ -32,6 +32,9 @@
   because this can cause knock-on errors at awkward times.
   (Andrew Bennetts, #687653)
 
+* ``https`` access works again with recent versions of python2.7.
+  (Vincent Ladeuil, #693880)
+
 * RevisionTree.is_executable no longer returns None for directories and
   symlinks.  Instead, it returns False, like other Trees and methods.
   (Aaron Bentley, #681885)

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py	2010-10-08 10:09:37 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py	2010-12-24 17:39:11 +0000
@@ -90,15 +90,19 @@
         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()
-        self.report_activity(len(s), 'read')
-        return s
+    # httplib in python 2.4 and 2.5 defines a SSLFile wrapper whose readline
+    # method lacks the size parameter. python2.6 provides a proper ssl socket
+    # and added it. python2.7 uses it, forcing us to provide it.
+    if sys.version_info < (2, 6):
+        def readline(self):
+            s = self.filesock.readline()
+            self.report_activity(len(s), 'read')
+            return s
+    else:
+        def readline(self, size=-1):
+            s = self.filesock.readline(size)
+            self.report_activity(len(s), 'read')
+            return s
 
     def __getattr__(self, name):
         return getattr(self.filesock, name)