Rev 5580: Merge the fix in trunk in file:///home/vila/src/bzr/bugs/693880-ssl-readline/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Dec 24 16:30:37 GMT 2010
At file:///home/vila/src/bzr/bugs/693880-ssl-readline/
------------------------------------------------------------
revno: 5580 [merge]
revision-id: v.ladeuil+lp at free.fr-20101224163036-6sx53r92rkrjv0d4
parent: pqm at pqm.ubuntu.com-20101221115149-y0jab8xbwmo693gs
parent: v.ladeuil+lp at free.fr-20101224161007-kyoqdozche3k92bs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 693880-ssl-readline
timestamp: Fri 2010-12-24 17:30:36 +0100
message:
Merge the fix in trunk
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py 2010-10-18 10:01:47 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py 2010-12-24 16:30:36 +0000
@@ -110,15 +110,16 @@
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
+ if sys.version < (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)
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt 2010-12-16 20:41:47 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt 2010-12-24 16:30:36 +0000
@@ -32,6 +32,10 @@
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)
+
+
Improvements
************
More information about the bazaar-commits
mailing list