Rev 4788: (vila) Fix bug #475585, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4788 [merge]
revision-id: pqm at pqm.ubuntu.com-20091105205349-t6i87y0r027ikb98
parent: pqm at pqm.ubuntu.com-20091105160215-rjpz3n473ixk4p3i
parent: john at arbash-meinel.com-20091105200836-8e5jfn2h6l2ndh67
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-11-05 20:53:49 +0000
message:
  (vila) Fix bug #475585,
  	the lp: proxy support broke python2.4 compatibility
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
=== modified file 'NEWS'
--- a/NEWS	2009-11-04 22:29:40 +0000
+++ b/NEWS	2009-11-05 20:08:36 +0000
@@ -24,11 +24,6 @@
 * Hooks daughter classes should always call the base constructor.
   (Alexander Belchenko, Vincent Ladeuil, #389648) 
 
-* Sanitize commit messages that come in from the '-m' flag. We translate
-  '\r\n' => '\n' and a plain '\r' => '\n'. The storage layer doesn't
-  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.)
-
 * 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
@@ -37,6 +32,14 @@
   are now treated as quoted ``bzr ignore '*.py'``.
   (John Arbash Meinel, #425510, #426410, #194450)
 
+* Sanitize commit messages that come in from the '-m' flag. We translate
+  '\r\n' => '\n' and a plain '\r' => '\n'. The storage layer doesn't
+  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.)
+
+* The fix for bug #186920 accidentally broke compatibility with python
+  2.4.  (Vincent Ladeuil, #475585)
+
 
 Improvements
 ************

=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- a/bzrlib/plugins/launchpad/lp_registration.py	2009-10-30 21:02:37 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py	2009-11-05 18:32:31 +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