Scrapy, a fast high-level web crawling & scraping framework for Python.
Move get_openssl_version function to scrapy.utils.ssl
Eugenio Lacuestada385b56b10a
diff --git a/scrapy/utils/ssl.py b/scrapy/utils/ssl.pyindex e54232abd..632827471 100644--- a/scrapy/utils/ssl.py+++ b/scrapy/utils/ssl.py@@ -1,5 +1,6 @@# -*- coding: utf-8 -*-+import OpenSSLimport OpenSSL._util as pyOpenSSLutilfrom scrapy.utils.python import to_native_str@@ -48,3 +49,10 @@ def get_temp_key_info(ssl_object):key_info.append(ffi_buf_to_string(pyOpenSSLutil.lib.OBJ_nid2sn(key_type)))key_info.append('%s bits' % pyOpenSSLutil.lib.EVP_PKEY_bits(temp_key))return ', '.join(key_info)+++def get_openssl_version():+ system_openssl = OpenSSL.SSL.SSLeay_version(+ OpenSSL.SSL.SSLEAY_VERSION+ ).decode('ascii', errors='replace')+ return '{} ({})'.format(OpenSSL.version.__version__, system_openssl)diff --git a/scrapy/utils/versions.py b/scrapy/utils/versions.pyindex 3f8122154..48484b303 100644--- a/scrapy/utils/versions.py+++ b/scrapy/utils/versions.py@@ -4,12 +4,12 @@ import sysimport cryptographyimport cssselectimport lxml.etree-import OpenSSLimport parselimport twistedimport w3libimport scrapy+from scrapy.utils.ssl import get_openssl_versiondef scrapy_components_versions():@@ -25,14 +25,7 @@ def scrapy_components_versions():("w3lib", w3lib.__version__),("Twisted", twisted.version.short()),("Python", sys.version.replace("\n", "- ")),- ("pyOpenSSL", _get_openssl_version()),+ ("pyOpenSSL", get_openssl_version()),("cryptography", cryptography.__version__),("Platform", platform.platform()),]---def _get_openssl_version():- openssl = OpenSSL.SSL.SSLeay_version(- OpenSSL.SSL.SSLEAY_VERSION- ).decode('ascii', errors='replace')- return '{} ({})'.format(OpenSSL.version.__version__, openssl)