Scrapy, a fast high-level web crawling & scraping framework for Python.
Import xlib.tx code from twisted proper
nyov534772f6ea83
diff --git a/scrapy/core/downloader/handlers/http11.py b/scrapy/core/downloader/handlers/http11.pyindex 404e9160b..54aa359fb 100644--- a/scrapy/core/downloader/handlers/http11.py+++ b/scrapy/core/downloader/handlers/http11.py@@ -13,8 +13,9 @@ from twisted.web.http_headers import Headers as TxHeadersfrom twisted.web.iweb import IBodyProducer, UNKNOWN_LENGTHfrom twisted.internet.error import TimeoutErrorfrom twisted.web.http import PotentialDataLoss-from scrapy.xlib.tx import Agent, ProxyAgent, ResponseDone, \- HTTPConnectionPool, TCP4ClientEndpoint+from twisted.web.client import Agent, ProxyAgent, ResponseDone, \+ HTTPConnectionPool+from twisted.internet.endpoints import TCP4ClientEndpointfrom scrapy.http import Headersfrom scrapy.responsetypes import responsetypesdiff --git a/scrapy/downloadermiddlewares/httpcache.py b/scrapy/downloadermiddlewares/httpcache.pyindex 521327bfe..30e49b886 100644--- a/scrapy/downloadermiddlewares/httpcache.py+++ b/scrapy/downloadermiddlewares/httpcache.py@@ -3,10 +3,10 @@ from twisted.internet import deferfrom twisted.internet.error import TimeoutError, DNSLookupError, \ConnectionRefusedError, ConnectionDone, ConnectError, \ConnectionLost, TCPTimedOutError+from twisted.web.client import ResponseFailedfrom scrapy import signalsfrom scrapy.exceptions import NotConfigured, IgnoreRequestfrom scrapy.utils.misc import load_object-from scrapy.xlib.tx import ResponseFailedclass HttpCacheMiddleware(object):diff --git a/scrapy/downloadermiddlewares/retry.py b/scrapy/downloadermiddlewares/retry.pyindex 74938067f..c9c512be8 100644--- a/scrapy/downloadermiddlewares/retry.py+++ b/scrapy/downloadermiddlewares/retry.py@@ -17,10 +17,10 @@ from twisted.internet import deferfrom twisted.internet.error import TimeoutError, DNSLookupError, \ConnectionRefusedError, ConnectionDone, ConnectError, \ConnectionLost, TCPTimedOutError+from twisted.web.client import ResponseFailedfrom scrapy.exceptions import NotConfiguredfrom scrapy.utils.response import response_status_message-from scrapy.xlib.tx import ResponseFailedfrom scrapy.core.downloader.handlers.http11 import TunnelErrorlogger = logging.getLogger(__name__)diff --git a/tests/test_downloadermiddleware_retry.py b/tests/test_downloadermiddleware_retry.pyindex 3de9399cf..eb17974bf 100644--- a/tests/test_downloadermiddleware_retry.py+++ b/tests/test_downloadermiddleware_retry.py@@ -3,10 +3,10 @@ from twisted.internet import deferfrom twisted.internet.error import TimeoutError, DNSLookupError, \ConnectionRefusedError, ConnectionDone, ConnectError, \ConnectionLost, TCPTimedOutError+from twisted.web.client import ResponseFailedfrom scrapy import twisted_versionfrom scrapy.downloadermiddlewares.retry import RetryMiddleware-from scrapy.xlib.tx import ResponseFailedfrom scrapy.spiders import Spiderfrom scrapy.http import Request, Responsefrom scrapy.utils.test import get_crawler