Print cryptography package version

scrapy · Sep 7, 2017 · abaf466 · abaf466
1 parent b8fabee
commit abaf466
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/scrapy/commands/version.py b/scrapy/commands/version.py
@@ -23,8 +23,11 @@ def add_options(self, parser):
 
     def run(self, args, opts):
         if opts.verbose:
-            for name, version in scrapy_components_versions():
-                print("%-9s : %s" % (name, version))
+            versions = scrapy_components_versions()
+            width = max(len(n) for (n, _) in versions)
+            patt = "%-{}s : %s".format(width)
+            for name, version in versions:
+                print(patt % (name, version))
         else:
             print("Scrapy %s" % scrapy.__version__)
 
diff --git a/scrapy/utils/versions.py b/scrapy/utils/versions.py
@@ -17,6 +17,11 @@ def scrapy_components_versions():
         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__),
@@ -28,6 +33,7 @@ def scrapy_components_versions():
         ("Twisted", twisted.version.short()),
         ("Python", sys.version.replace("\n", "- ")),
         ("pyOpenSSL", _get_openssl_version()),
+        ("cryptography", cryptography_version),
         ("Platform",  platform.platform()),
     ]