Scrapy, a fast high-level web crawling & scraping framework for Python.
Handle Twisted versions before 15.0
Paul Tremberth6b092c66809e
diff --git a/scrapy/core/downloader/handlers/http11.py b/scrapy/core/downloader/handlers/http11.pyindex 7b77d82da..216671f82 100644--- a/scrapy/core/downloader/handlers/http11.py+++ b/scrapy/core/downloader/handlers/http11.py@@ -14,7 +14,11 @@ from twisted.web.iweb import IBodyProducer, UNKNOWN_LENGTHfrom twisted.internet.error import TimeoutErrorfrom twisted.web.http import _DataLoss, PotentialDataLossfrom twisted.web.client import Agent, ProxyAgent, ResponseDone, \- HTTPConnectionPool, ResponseFailed, URI+ HTTPConnectionPool, ResponseFailed+try:+ from twisted.web.client import URI+except ImportError:+ from twisted.web.client import _URI as URIfrom twisted.internet.endpoints import TCP4ClientEndpointfrom scrapy.http import Headers@@ -244,7 +248,12 @@ class ScrapyProxyAgent(Agent):"""# Cache *all* connections under the same key, since we are only# connecting to a single destination, the proxy:- proxyEndpoint = self._getEndpoint(self._proxyURI)+ if twisted_version >= (15, 0, 0):+ proxyEndpoint = self._getEndpoint(self._proxyURI)+ else:+ proxyEndpoint = self._getEndpoint(self._proxyURI.scheme,+ self._proxyURI.host,+ self._proxyURI.port)key = ("http-proxy", self._proxyURI.host, self._proxyURI.port)return self._requestWithEndpoint(key, proxyEndpoint, method,URI.fromBytes(uri), headers,