* [gentoo-commits] gentoo-x86 commit in dev-vcs/bzr/files: bzr-2.2.2-python-2.7.patch
@ 2010-12-07 7:55 Christian Faulhammer (fauli)
0 siblings, 0 replies; only message in thread
From: Christian Faulhammer (fauli) @ 2010-12-07 7:55 UTC (permalink / raw
To: gentoo-commits
fauli 10/12/07 07:55:27
Added: bzr-2.2.2-python-2.7.patch
Log:
Fix support for Python 2.7, taken from upstream, reported by Alessandro Guido <alessandro.guido+bugzilla AT gmail DOT com> in bug 347555
(Portage version: 2.1.9.24/cvs/Linux i686)
Revision Changes Path
1.1 dev-vcs/bzr/files/bzr-2.2.2-python-2.7.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/files/bzr-2.2.2-python-2.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/files/bzr-2.2.2-python-2.7.patch?rev=1.1&content-type=text/plain
Index: bzr-2.2.2-python-2.7.patch
===================================================================
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py 2010-05-08 05:56:28 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py 2010-09-15 02:43:44 +0000
@@ -75,6 +75,26 @@
)
+class addinfourl(urllib2.addinfourl):
+ '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
+
+ In python-2.7, xmlrpclib expects that the response object that it receives
+ has a getheader method. httplib.HTTPResponse provides this but
+ urllib2.addinfourl does not. Add the necessary functions here, ported to
+ use the internal data structures of addinfourl.
+ '''
+
+ def getheader(self, name, default=None):
+ if self.headers is None:
+ raise httplib.ResponseNotReady()
+ return self.headers.getheader(name, default)
+
+ def getheaders(self):
+ if self.headers is None:
+ raise httplib.ResponseNotReady()
+ return self.headers.items()
+
+
class _ReportingFileSocket(object):
def __init__(self, filesock, report_activity=None):
@@ -656,7 +676,7 @@
r = response
r.recv = r.read
fp = socket._fileobject(r, bufsize=65536)
- resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
+ resp = addinfourl(fp, r.msg, req.get_full_url())
resp.code = r.status
resp.msg = r.reason
resp.version = r.version
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-07 7:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 7:55 [gentoo-commits] gentoo-x86 commit in dev-vcs/bzr/files: bzr-2.2.2-python-2.7.patch Christian Faulhammer (fauli)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox