From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sat, 30 Oct 2010 07:02:33 +0000 (-0700)
Subject: setup: show-tool-versions: emit module and __version__ information even when module... 
X-Git-Tag: trac-4800~17
X-Git-Url: https://git.rkrishnan.org/zeppelin?a=commitdiff_plain;h=0ab6211da4babbb86d33aeef2579649eb36e762b;p=tahoe-lafs%2Ftahoe-lafs.git

setup: show-tool-versions: emit module and __version__ information even when module name != distribution (package) name, and add TwistedCore, TwistedWeb, and TwistedConch
---

diff --git a/misc/build_helpers/show-tool-versions.py b/misc/build_helpers/show-tool-versions.py
index 45b1645b..ed23f8db 100644
--- a/misc/build_helpers/show-tool-versions.py
+++ b/misc/build_helpers/show-tool-versions.py
@@ -94,7 +94,10 @@ def print_setuptools_ver():
         sys.stderr.flush()
         pass
 
-def print_py_pkg_ver(pkgname):
+def print_py_pkg_ver(pkgname, modulename=None):
+    if modulename is None:
+        modulename = pkgname
+
     print
     try:
         import pkg_resources
@@ -110,6 +113,17 @@ def print_py_pkg_ver(pkgname):
         traceback.print_exc(file=sys.stderr)
         sys.stderr.flush()
         pass
+    try:
+        __import__(modulename)
+    except ImportError:
+        pass
+    else:
+        modobj = sys.modules.get(modulename)
+        print pkgname + ' module: ' + str(modobj)
+        try:
+            print pkgname + ' __version__: ' + str(modobj.__version__)
+        except AttributeError:
+            pass
 
 print_platform()
 
@@ -139,3 +153,7 @@ print_py_pkg_ver('pyflakes')
 print_py_pkg_ver('zope.interface')
 print_py_pkg_ver('setuptools_darcs')
 print_py_pkg_ver('darcsver')
+print_py_pkg_ver('Twisted', 'twisted')
+print_py_pkg_ver('TwistedCore', 'twisted.python')
+print_py_pkg_ver('TwistedWeb', 'twisted.web')
+print_py_pkg_ver('TwistedConch', 'twisted.conch')