From 301847d862a1412f3aa8302b242e3f6b9f1442e4 Mon Sep 17 00:00:00 2001 From: Paul Tremberth Date: Mon, 20 Feb 2017 16:40:37 +0100 Subject: [PATCH] Set context factory implementation based on Twisted version --- scrapy/core/downloader/contextfactory.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scrapy/core/downloader/contextfactory.py b/scrapy/core/downloader/contextfactory.py index 4bd4c6166..a94a89205 100644 --- a/scrapy/core/downloader/contextfactory.py +++ b/scrapy/core/downloader/contextfactory.py @@ -1,15 +1,15 @@ from OpenSSL import SSL from twisted.internet.ssl import ClientContextFactory -try: +from scrapy import twisted_version + +if twisted_version >= (14, 0, 0): from zope.interface.declarations import implementer - # the following should be available from Twisted 14.0.0 from twisted.internet.ssl import (optionsForClientTLS, CertificateOptions, platformTrust) - from twisted.web.client import BrowserLikePolicyForHTTPS from twisted.web.iweb import IPolicyForHTTPS @@ -86,7 +86,7 @@ try: 'method': self._ssl_method, }) -except ImportError: +else: class ScrapyClientContextFactory(ClientContextFactory): "A SSL context factory which is more permissive against SSL bugs."