Rev 5583: Finally merge the approved version in file:///home/vila/src/bzr/bugs/693880-ssl-readline/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/693880-ssl-readline/

------------------------------------------------------------
revno: 5583 [merge]
revision-id: v.ladeuil+lp at free.fr-20101224174814-cyhml5o8oljhp43x
parent: v.ladeuil+lp at free.fr-20101224174753-xm6860hboq33o7u1
parent: v.ladeuil+lp at free.fr-20101224173625-o26yjen6dy51i844
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 693880-ssl-readline
timestamp: Fri 2010-12-24 18:48:14 +0100
message:
  Finally merge the approved version
modified:
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2010-12-24 16:58:39 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2010-12-24 17:48:14 +0000
@@ -110,6 +110,9 @@
         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()