Rev 5119: Clarify the fix intent. in file:///home/vila/src/bzr/bugs/2.2-693880-ssl-readline/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Dec 24 17:36:26 GMT 2010
At file:///home/vila/src/bzr/bugs/2.2-693880-ssl-readline/
------------------------------------------------------------
revno: 5119
revision-id: v.ladeuil+lp at free.fr-20101224173625-o26yjen6dy51i844
parent: v.ladeuil+lp at free.fr-20101224165811-mnzg4zfa6iw4hio9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.2-693880-ssl-readline
timestamp: Fri 2010-12-24 18:36:25 +0100
message:
Clarify the fix intent.
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py 2010-12-24 16:58:11 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py 2010-12-24 17:36:25 +0000
@@ -90,6 +90,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()
More information about the bazaar-commits
mailing list