Scrapy, a fast high-level web crawling & scraping framework for Python.
Backward-compatibility for common Scrapy context factory patterns
Paul Tremberth095495e99ce3
diff --git a/scrapy/core/downloader/contextfactory.py b/scrapy/core/downloader/contextfactory.pyindex afc52c354..09fcd491a 100644--- a/scrapy/core/downloader/contextfactory.py+++ b/scrapy/core/downloader/contextfactory.py@@ -30,7 +30,18 @@ try:def getCertificateOptions(self):# setting verify=True will require you to provide CAs# to verify against; in other words: it's not that simple- return CertificateOptions(verify=False, method=self._ssl_method)++ # backward-compatible SSL/TLS method:+ #+ # * this will respect `method` attribute in often recommended+ # `ScrapyClientContextFactory` subclass+ # (https://github.com/scrapy/scrapy/issues/1429#issuecomment-131782133)+ #+ # * getattr() for `_ssl_method` attribute for context factories+ # not calling super(..., self).__init__+ return CertificateOptions(verify=False,+ method=getattr(self, 'method',+ getattr(self, '_ssl_method', None)))# kept for old-style HTTP/1.0 downloader context twisted calls,# e.g. connectSSL()diff --git a/scrapy/core/downloader/tls.py b/scrapy/core/downloader/tls.pyindex 121ee83ac..64ebb0714 100644--- a/scrapy/core/downloader/tls.py+++ b/scrapy/core/downloader/tls.py@@ -8,8 +8,8 @@ METHOD_TLSv11 = 'TLSv1.1'METHOD_TLSv12 = 'TLSv1.2'openssl_methods = {- METHOD_TLS: SSL.SSLv23_METHOD, # protocol negotiation (recommended)- METHOD_SSLv3: SSL.SSLv3_METHOD, # SSL 3 (NOT recommended)+ METHOD_TLS: SSL.SSLv23_METHOD, # protocol negotiation (recommended)+ METHOD_SSLv3: SSL.SSLv3_METHOD, # SSL 3 (NOT recommended)METHOD_TLSv10: SSL.TLSv1_METHOD, # TLS 1.0 onlyMETHOD_TLSv11: getattr(SSL, 'TLSv1_1_METHOD', 5), # TLS 1.1 onlyMETHOD_TLSv12: getattr(SSL, 'TLSv1_2_METHOD', 6), # TLS 1.2 only