Scrapy, a fast high-level web crawling & scraping framework for Python.
Cleanup METHOD_SSLv3
Gábor Lipták79a4bc3da02b
diff --git a/docs/topics/settings.rst b/docs/topics/settings.rstindex 90f13f3ef..a711fd197 100644--- a/docs/topics/settings.rst+++ b/docs/topics/settings.rst@@ -564,7 +564,6 @@ This setting must be one of these string values:set this if you want the behavior of Scrapy<1.1- ``'TLSv1.1'``: forces TLS version 1.1- ``'TLSv1.2'``: forces TLS version 1.2-- ``'SSLv3'``: forces SSL version 3 (**not recommended**).. setting:: DOWNLOADER_CLIENT_TLS_VERBOSE_LOGGINGdiff --git a/scrapy/core/downloader/contextfactory.py b/scrapy/core/downloader/contextfactory.pyindex b5318c7bb..4abde2238 100644--- a/scrapy/core/downloader/contextfactory.py+++ b/scrapy/core/downloader/contextfactory.py@@ -21,7 +21,7 @@ class ScrapyClientContextFactory(BrowserLikePolicyForHTTPS):which allows TLS protocol negotiation'A TLS/SSL connection established with [this method] may- understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols.'+ understand the TLSv1, TLSv1.1 and TLSv1.2 protocols.'"""def __init__(self, method=SSL.SSLv23_METHOD, tls_verbose_logging=False, tls_ciphers=None, *args, **kwargs):diff --git a/scrapy/core/downloader/tls.py b/scrapy/core/downloader/tls.pyindex 19a56d9b6..698a1c85c 100644--- a/scrapy/core/downloader/tls.py+++ b/scrapy/core/downloader/tls.py@@ -11,7 +11,6 @@ from scrapy.utils.ssl import x509name_to_string, get_temp_key_infologger = logging.getLogger(__name__)-METHOD_SSLv3 = 'SSLv3'METHOD_TLS = 'TLS'METHOD_TLSv10 = 'TLSv1.0'METHOD_TLSv11 = 'TLSv1.1'@@ -20,7 +19,6 @@ METHOD_TLSv12 = 'TLSv1.2'openssl_methods = {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