Merge lp:~bzr/bzr/475585-lp-proxy-py24-compat into lp:bzr

[John A Meinel]

[John A Meinel (jameinel)]

This is Vincent's fix for XMLTransport not being compatible with python2.4 with a couple of small updates. The main one is to just move the NEWS entry to the right location.

I still don't have a good answer for Daggy Fixes + NEWS entries. Because you really need NEWS to be part of the statement where the patch *lands* and not where it was *based* on...

Anyway, since Vincent was happy with that fix, and *I'm* happy with the small comment tweaks here, I'm going to land this.

Now we just need to figure out what to do about 2.1.0b3. I *definitely* want to release it ahead of schedule, since this is a serious regression.

But do we just release it straight from an updated bzr.dev, or do we just apply this patch onto 2.1.0b2 and release that immediately.

=== modified file 'NEWS'
--- NEWS	2009-11-04 22:29:40 +0000
+++ NEWS	2009-11-05 20:15:23 +0000
@@ -29,6 +29,7 @@
   allow those because XML store silently translate it anyway. (The parser
   auto-translates \r\n => \n in ways that are hard for us to catch.)
 
+<<<<<<< TREE
 * On Windows, do glob expansion at the command-line level (as is usually
   done in bash, etc.) This means that *all* commands get glob expansion
   (bzr status, bzr add, bzr mv, etc). It uses a custom command line
@@ -38,6 +39,12 @@
   (John Arbash Meinel, #425510, #426410, #194450)
 
 
+=======
+* The fix for bug #186920 accidentally broke compatibility with python
+  2.4.  (Vincent Ladeuil, #475585)
+
+
+>>>>>>> MERGE-SOURCE
 Improvements
 ************
 
 
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- bzrlib/plugins/launchpad/lp_registration.py	2009-10-30 21:02:37 +0000
+++ bzrlib/plugins/launchpad/lp_registration.py	2009-11-05 20:15:23 +0000
@@ -56,8 +56,12 @@
 
 class XMLRPCTransport(xmlrpclib.Transport):
 
-    def __init__(self, scheme, use_datetime=0):
-        xmlrpclib.Transport.__init__(self, use_datetime=use_datetime)
+    def __init__(self, scheme):
+        # In python2.4 xmlrpclib.Transport is a old-style class, and does not
+        # define __init__, so we check first
+        init = getattr(xmlrpclib.Transport, '__init__', None)
+        if init is not None:
+            init(self)
         self._scheme = scheme
         self._opener = _urllib2_wrappers.Opener()
         self.verbose = 0