Merge pull request #718 from dangra/twisted-14.0.0

[WIP] does it work with Twisted 14.0.0?
2025-02-23 20:03:45 +00:00 · 2014-06-25 09:50:31 -03:00 · 2014-06-25 09:50:31 -03:00 · f72b1597b4
commit f72b1597b4
parent 559af943dc d48158427a
3 changed files with 3 additions and 2 deletions
--- 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
--- 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,
--- 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',