Bazaar

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

  1. 475585-lp-proxy-py24-compat
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vila/bzr/475585-lp-proxy-py24-compat
Merge into: lp:bzr
Diff against target: 33 lines (+9/-2)
2 files modified
NEWS (+4/-0)
bzrlib/plugins/launchpad/lp_registration.py (+5/-2)
To merge this branch: bzr merge lp:~vila/bzr/475585-lp-proxy-py24-compat
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+14489@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

This patch fixes the issue by checking explicitly that we can call xmlrpclib.Transport.__init__

That still leave the question about how and when we lost python2.4 tests...

Revision history for this message
John A Meinel (jameinel) wrote :

This has been superseded by:
https://code.launchpad.net/~bzr/bzr/475585-lp-proxy-py24-compat/+merge/14492

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2009-11-04 22:29:40 +0000
+++ NEWS 2009-11-05 20:15:20 +0000
@@ -135,7 +135,11 @@
135 and similar errors. (Andrew Bennetts, #429747, #243391)135 and similar errors. (Andrew Bennetts, #429747, #243391)
136136
137* Launchpad urls can now be resolved from behind proxies.137* Launchpad urls can now be resolved from behind proxies.
138<<<<<<< TREE
138 (Gordon Tyler, Vincent Ladeuil, #186920)139 (Gordon Tyler, Vincent Ladeuil, #186920)
140=======
141 (Gordon Tyler, Vincent Ladeuil, #186920, #475585)
142>>>>>>> MERGE-SOURCE
139143
140* Reduce the strictness for StaticTuple, instead add a debug flag144* Reduce the strictness for StaticTuple, instead add a debug flag
141 ``-Dstatic_tuple`` which will change apis to be strict and raise errors.145 ``-Dstatic_tuple`` which will change apis to be strict and raise errors.
142146
=== 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:20 +0000
@@ -56,8 +56,11 @@
5656
57class XMLRPCTransport(xmlrpclib.Transport):57class XMLRPCTransport(xmlrpclib.Transport):
5858
59 def __init__(self, scheme, use_datetime=0):59 def __init__(self, scheme):
60 xmlrpclib.Transport.__init__(self, use_datetime=use_datetime)60 init = getattr(xmlrpclib.Transport, '__init__', None)
61 if init is not None:
62 # Not available before python2.5
63 init(self)
61 self._scheme = scheme64 self._scheme = scheme
62 self._opener = _urllib2_wrappers.Opener()65 self._opener = _urllib2_wrappers.Opener()
63 self.verbose = 066 self.verbose = 0