Rev 5723: Merge 2.3 into trunk including additional fix for #654733 in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5723 [merge]
revision-id: v.ladeuil+lp at free.fr-20110314144542-2a4in0pt3n6e836i
parent: pqm at pqm.ubuntu.com-20110314144218-nubbkx0b9vwm5ma4
parent: pqm at pqm.ubuntu.com-20110314124636-z4petx4rpbgoo4hc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2011-03-14 15:45:42 +0100
message:
  Merge 2.3 into trunk including additional fix for #654733
modified:
  bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- a/bzrlib/plugins/launchpad/test_register.py	2011-01-12 01:01:53 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py	2011-03-14 10:11:58 +0000
@@ -67,16 +67,19 @@
         """
         class FakeHttpResponse(object):
 
-            def __init__(self, status, reason, headers, body):
+            def __init__(self, status, reason, body):
                 self.status = status
                 self.reason = reason
-                self.headers = headers
                 self.body = body
 
             def read(self, size=-1):
                 return self.body.read(size)
 
-        return FakeHttpResponse(200, 'OK', [], self.getfile())
+            def getheader(self, name, default):
+                # We don't have headers
+                return default
+
+        return FakeHttpResponse(200, 'OK', self.getfile())
 
     def getfile(self):
         """Return a fake file containing the response content."""

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-03-11 10:58:18 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-03-14 14:45:42 +0000
@@ -56,6 +56,13 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* FreeBSD8 has switched to python-2.7 which revealed a re-occurrence of a test
+  failure in the launchpad plugin. ``xmlrpclib.py`` on natty carries a patch
+  that is not in python-2.7 upstream and masked the issue. An additional fix
+  has been added in the interim
+  (<http://psf.upfronthosting.co.za/roundup/tracker/issue8194> should be fixed
+  in python > 2.7.1).  (Vincent Ladeuil, #654733)
+
 
 bzr 2.3.1
 #########