tweaked module-dep graph tool

diff --git a/tools/depgraph2dot.py b/tools/depgraph2dot.py
index 930e24f..b8ecbce 100755 (executable)
--- a/tools/depgraph2dot.py
+++ b/tools/depgraph2dot.py
@@ -21,7 +21,7 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 

-import sys, getopt, colorsys, imp, md5
+import sys, getopt, colorsys, imp, hashlib

 
 class pydepgraphdot:
 
 
 class pydepgraphdot:
 


@@ -179,7 +179,7 @@ class pydepgraphdot:
                 return s[:i]
         
     def color_from_name(self,name):
                 return s[:i]
         
     def color_from_name(self,name):

-        n = md5.md5(name).digest()
+        n = hashlib.md5(name).digest()

         hf = float(ord(n[0])+ord(n[1])*0xff)/0xffff
         sf = float(ord(n[2]))/0xff
         vf = float(ord(n[3]))/0xff
         hf = float(ord(n[0])+ord(n[1])*0xff)/0xffff
         sf = float(ord(n[2]))/0xff
         vf = float(ord(n[3]))/0xff

diff --git a/tools/py2depgraph.py b/tools/py2depgraph.py
index 15f60e8..022add3 100755 (executable)
--- a/tools/py2depgraph.py
+++ b/tools/py2depgraph.py
@@ -23,6 +23,8 @@
 import sys, pprint
 import modulefinder
 
 import sys, pprint
 import modulefinder
 

+focus=[ 'sfa' , 'OpenSSL', 'M2Crypto', 'xmlrpclib', 'threading' ]
+

 class mymf(modulefinder.ModuleFinder):
     def __init__(self,*args,**kwargs):
         self._depgraph = {}
 class mymf(modulefinder.ModuleFinder):
     def __init__(self,*args,**kwargs):
         self._depgraph = {}


@@ -39,8 +41,11 @@ class mymf(modulefinder.ModuleFinder):
             self._last_caller = old_last_caller
             
     def import_module(self,partnam,fqname,parent):
             self._last_caller = old_last_caller
             
     def import_module(self,partnam,fqname,parent):

-        if not fqname.startswith('sfa'): 
-            print >>sys.stderr, "Trimmed fqname",fqname
+        keep=False
+        for start in focus:
+            if fqname.startswith(start): keep=True
+        if not keep:
+            print >> sys.stderr, "Trimmed fqname",fqname

             return
         r = modulefinder.ModuleFinder.import_module(self,partnam,fqname,parent)
         if r is not None:
             return
         r = modulefinder.ModuleFinder.import_module(self,partnam,fqname,parent)
         if r is not None: