make it work with twisted 15.x

david415 · Jul 2, 2015 · 38f1a0c · 38f1a0c
1 parent ff027ac
commit 38f1a0c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/txtorhttpproxy/agent.py b/txtorhttpproxy/agent.py
@@ -2,12 +2,15 @@
 import os
 import binascii
 from zope.interface import implementer
-
-from twisted.web.client import Agent, _URI
+from twisted.internet.endpoints import clientFromString
 from twisted.web.iweb import IAgent
 from twisted.web.error import SchemeNotSupported
-from twisted.internet.endpoints import clientFromString
-
+from twisted.web.client import Agent
+try:
+    from twisted.web.client import URI
+except ImportError:
+    # for twisted 14.x
+    from twisted.web.client import _URI as URI
 
 class TorAgentCircuitIsolationModeNotSupported(Exception):
     """
@@ -146,7 +149,7 @@ def request(self, method, uri, headers=None, bodyProducer=None):
 
         @see: L{twisted.web.iweb.IAgent.request}
         """
-        parsedURI = _URI.fromBytes(uri)
+        parsedURI = URI.fromBytes(uri)
         endpoint = self._getEndpoint(parsedURI.scheme, parsedURI.host,
                                          parsedURI.port)