Merge lp:~toshio/bzr/python27-lp-fix into lp:bzr

[Toshio Kuratomi]

Fix traceback with python 2.7's xmlrpclib.

Fixes a problem running on python-2.7.

[Martin Pool (mbp)]

Thanks. It would be good to have a comment in the class explaining with a link why we need this.

+ return self.headers/getheader(name, default)

Is that really true? It overrides /?

Also we need news.

[Toshio Kuratomi (toshio)]

That's a typo. Figuring out what it does need to return now.

[Toshio Kuratomi (toshio)]

New revision pushed -- corrects the return value, adds a class docstring to explain why we need it, and adds an entry to NEWS.

[Martin Pool (mbp)]

It would be nice to have a test that would have failed when your typo was present. I guess that would require running up a real listening xmlrpc server, which is perhaps a bit more work...

I might give people a chance to object and say that's easy to do, otherwise let's merge it.

It would be worth manually testing it still works on at least one of python2.[456].

review: Approve

[Martin Pool (mbp)]

This does seem to work for me on python 2.6.6

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-14 09:29:57 +0000
+++ NEWS	2010-09-15 02:43:44 +0000
@@ -92,6 +92,9 @@
 Bug Fixes
 *********
 
+* Fix traceback with python-2.7's xmlrpclib
+  (Toshio Kuratomi, #612096)
+
 * Allow using both --using and --diff-options. 
   (Matthäus G. Chajdas, #234708)
 
 
=== 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