From bfe02b019ef7358be889b3704ca5c17ff7a616db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Wed, 25 Jun 2014 03:25:20 -0300 Subject: [PATCH 1/2] Revert "limit Twisted support to pre-14.0.0 while #718 is fixed" This reverts commit 65f69e16095799e05de79a3f8f449f7b9edb27aa. --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7c52c14d0..0df9a558c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Twisted>=10.0.0,<14.0.0 +Twisted>=10.0.0 lxml pyOpenSSL cssselect>=0.9 diff --git a/setup.py b/setup.py index 1d6c444d0..6efe64074 100644 --- a/setup.py +++ b/setup.py @@ -123,7 +123,7 @@ except ImportError: from distutils.core import setup else: setup_args['install_requires'] = [ - 'Twisted>=10.0.0,<14.0.0', + 'Twisted>=10.0.0', 'w3lib>=1.2', 'queuelib', 'lxml', From d48158427ae29001c10743b0c924d20795f79788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Wed, 25 Jun 2014 04:21:56 -0300 Subject: [PATCH 2/2] hold a reference to backwards compatible _contextFactory --- scrapy/core/downloader/handlers/http11.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scrapy/core/downloader/handlers/http11.py b/scrapy/core/downloader/handlers/http11.py index de3cc8756..52eb35eba 100644 --- a/scrapy/core/downloader/handlers/http11.py +++ b/scrapy/core/downloader/handlers/http11.py @@ -118,6 +118,7 @@ class TunnelingAgent(Agent): super(TunnelingAgent, self).__init__(reactor, contextFactory, connectTimeout, bindAddress, pool) self._proxyConf = proxyConf + self._contextFactory = contextFactory def _getEndpoint(self, scheme, host, port): return TunnelingTCP4ClientEndpoint(self._reactor, host, port,