launchpad-reviewers team mailing list archive

[Colin Watson <mp+411357@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-xmlrpc-client into launchpad:master.

Commit message:
Fix conflict between xmlrpc.client and twisted.web.xmlrpc

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411357

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-xmlrpc-client into launchpad:master.

diff --git a/lib/lp/buildmaster/tests/mock_slaves.py b/lib/lp/buildmaster/tests/mock_slaves.py
index 78fa6dc..ba8fb8f 100644
--- a/lib/lp/buildmaster/tests/mock_slaves.py
+++ b/lib/lp/buildmaster/tests/mock_slaves.py
@@ -27,7 +27,7 @@ from lpbuildd.tests.harness import BuilddSlaveTestSetup
 import six
 from testtools.content import attach_file
 from twisted.internet import defer
-from twisted.web import xmlrpc
+from twisted.web.xmlrpc import Proxy
 
 from lp.buildmaster.enums import (
     BuilderCleanStatus,
@@ -275,7 +275,7 @@ class TrivialBehaviour:
     pass
 
 
-class DeadProxy(xmlrpc.Proxy):
+class DeadProxy(Proxy):
     """An xmlrpc.Proxy that doesn't actually send any messages.
 
     Used when you want to test timeouts, for example.