Merge ~cjwatson/launchpad:fix-xmlrpc-client into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 34025e1b77c570fba823e26b204c0657adb60eab
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-xmlrpc-client
Merge into: launchpad:master
Diff against target: 22 lines (+2/-2)
1 file modified
lib/lp/buildmaster/tests/mock_slaves.py (+2/-2)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Cristian Gonzalez (community) Approve
Review via email: mp+411357@code.launchpad.net

Commit message

Fix conflict between xmlrpc.client and twisted.web.xmlrpc

Description of the change

Modules need to avoid doing both `import xmlrpc.client` and `from twisted.web import xmlrpc`, since there's then a namespace collision. Fortunately there was only one such case.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/buildmaster/tests/mock_slaves.py b/lib/lp/buildmaster/tests/mock_slaves.py
2index 78fa6dc..ba8fb8f 100644
3--- a/lib/lp/buildmaster/tests/mock_slaves.py
4+++ b/lib/lp/buildmaster/tests/mock_slaves.py
5@@ -27,7 +27,7 @@ from lpbuildd.tests.harness import BuilddSlaveTestSetup
6 import six
7 from testtools.content import attach_file
8 from twisted.internet import defer
9-from twisted.web import xmlrpc
10+from twisted.web.xmlrpc import Proxy
11
12 from lp.buildmaster.enums import (
13 BuilderCleanStatus,
14@@ -275,7 +275,7 @@ class TrivialBehaviour:
15 pass
16
17
18-class DeadProxy(xmlrpc.Proxy):
19+class DeadProxy(Proxy):
20 """An xmlrpc.Proxy that doesn't actually send any messages.
21
22 Used when you want to test timeouts, for example.

Subscribers

People subscribed via source and target branches

to status/vote changes: