Merge lp:~lamont/maas/bug-1504971 into lp:maas/1.8

[LaMont Jones]

[bug=1504971] Fix bug 1372767 regression.

Fix bug 1372767 regression. Closes bug 1504971. Bug 1505748 filed against twisted.

[Ricardo Bánffy (rbanffy)]

One very minor suggestion

[Blake Rouse (blake-rouse)]

Approved. Following ricardo's suggestion.

review: Approve

[Andres Rodriguez (andreserl)]

Lamont, shouldn't this have landed in 1.9 too?

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2015-08-03 18:04:27 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2015-10-13 20:29:29 +0000
@@ -109,6 +109,15 @@
 from twisted.web.client import getPage
 from zope.interface import implementer
 
+# XXX lamont 2015-10-13 LP:1504971 aka 1372767 revisited aka 1505748.
+# Twisted 15+ changes the name of web.client._URI class to web.client.URI.
+# Once we can require a new enough twisted to have the fix for 1505748, we
+# can drop the entire patch to twisted.
+try:
+    from twisted.web.client import _URI as URI
+except ImportError:
+    from twisted.web.client import URI
+
 
 maaslog = get_maas_logger("rpc.cluster")
 
@@ -638,7 +647,7 @@
         log.msg("Peer certificate: %r" % self.peerCertificate)
 
 
-class PatchedURI(twisted.web.client._URI):
+class PatchedURI(URI):
 
     @classmethod
     def fromBytes(cls, uri, defaultPort=None):
@@ -713,7 +722,10 @@
         # URL with an IPv6 address, at the point where `_makeGetterFactory`
         # calls `fromBytes`.  That last function assumes that a colon can only
         # occur in the URL's netloc portion as part of a port specification.
-        twisted.web.client._URI = PatchedURI
+        if hasattr(twisted.web.client, "_URI"):
+            twisted.web.client._URI = PatchedURI
+        else:
+            twisted.web.client.URI = PatchedURI
 
     def startService(self):
         self.time_started = self.clock.seconds()