From 595c995ee640e360e5b574577594b273cc8af071 Mon Sep 17 00:00:00 2001 From: Eugenio Lacuesta Date: Wed, 7 Aug 2019 15:38:04 -0300 Subject: [PATCH] Simplify version reporting --- scrapy/utils/versions.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/scrapy/utils/versions.py b/scrapy/utils/versions.py index 58c7aef85..3f8122154 100644 --- a/scrapy/utils/versions.py +++ b/scrapy/utils/versions.py @@ -1,8 +1,10 @@ import platform import sys +import cryptography import cssselect import lxml.etree +import OpenSSL import parsel import twisted import w3lib @@ -13,15 +15,6 @@ import scrapy def scrapy_components_versions(): lxml_version = ".".join(map(str, lxml.etree.LXML_VERSION)) libxml2_version = ".".join(map(str, lxml.etree.LIBXML_VERSION)) - try: - w3lib_version = w3lib.__version__ - except AttributeError: - w3lib_version = "<1.14.3" - try: - import cryptography - cryptography_version = cryptography.__version__ - except ImportError: - cryptography_version = "unknown" return [ ("Scrapy", scrapy.__version__), @@ -29,22 +22,17 @@ def scrapy_components_versions(): ("libxml2", libxml2_version), ("cssselect", cssselect.__version__), ("parsel", parsel.__version__), - ("w3lib", w3lib_version), + ("w3lib", w3lib.__version__), ("Twisted", twisted.version.short()), ("Python", sys.version.replace("\n", "- ")), ("pyOpenSSL", _get_openssl_version()), - ("cryptography", cryptography_version), + ("cryptography", cryptography.__version__), ("Platform", platform.platform()), ] def _get_openssl_version(): - try: - import OpenSSL - openssl = OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION)\ - .decode('ascii', errors='replace') - # pyOpenSSL 0.12 does not expose openssl version - except AttributeError: - openssl = 'Unknown OpenSSL version' - + openssl = OpenSSL.SSL.SSLeay_version( + OpenSSL.SSL.SSLEAY_VERSION + ).decode('ascii', errors='replace') return '{} ({})'.format(OpenSSL.version.__version__, openssl)