From 406b9a06fe67db09b53041724a126d59f11cb519 Mon Sep 17 00:00:00 2001 From: Paul Tremberth Date: Fri, 19 Feb 2016 02:56:26 +0100 Subject: [PATCH] Add missing import for implementer Also remove TLSv1.1 and TLSv1.2 method: these are available only from pyOpenSSL 0.14 https://github.com/pyca/pyopenssl/releases/tag/v0.14a1 --- scrapy/core/downloader/contextfactory.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scrapy/core/downloader/contextfactory.py b/scrapy/core/downloader/contextfactory.py index 4d90d17f8..28e8a0e53 100644 --- a/scrapy/core/downloader/contextfactory.py +++ b/scrapy/core/downloader/contextfactory.py @@ -5,6 +5,8 @@ from scrapy import twisted_version if twisted_version >= (14, 0, 0): + from zope.interface.declarations import implementer + from twisted.internet.ssl import optionsForClientTLS from twisted.web.client import BrowserLikePolicyForHTTPS from twisted.web.iweb import IPolicyForHTTPS @@ -65,11 +67,3 @@ class SSLv3ContextFactory(OpenSSLMethodContextFactory): class TLSv1ContextFactory(OpenSSLMethodContextFactory): openssl_method = SSL.TLSv1_METHOD - - -class TLSv11ContextFactory(OpenSSLMethodContextFactory): - openssl_method = SSL.TLSv1_1_METHOD - - -class TLSv12ContextFactory(OpenSSLMethodContextFactory): - openssl_method = SSL.TLSv1_2_METHOD