[Zope3-checkins] CVS: Zope3/utilities - finddeps.py:1.8

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/utilities
In directory cvs.zope.org:/tmp/cvs-serv12255

Modified Files:
	finddeps.py 
Log Message:
don't assume that "zope" and "zope.app" can't be direct dependencies;
there are certainly still some modules that live in zope.app directly
(remember: assumptions are bad, or at least worse than imagined!)


=== Zope3/utilities/finddeps.py 1.7 => 1.8 ===
--- Zope3/utilities/finddeps.py:1.7	Thu Mar 11 12:27:14 2004
+++ Zope3/utilities/finddeps.py	Thu Mar 11 14:43:59 2004
@@ -139,13 +139,6 @@
             match[0] = match[0][1:-1]
             match.append('.'.join(match[0].split('.')[:-1]))
 
-            # zope and zope.app should never be dependencies; they are
-            # too general
-            if 'zope' in match:
-                match.remove('zope')
-            if 'zope.app' in match:
-                match.remove('zope.app')
-
             for name in match:
                 if name.startswith('.'):
                     name = localModule + name
@@ -158,11 +151,7 @@
 
 
 def filterStandardModules(deps):
-    """Try to remove modules that are part of the standard Python library.
-
-    Note: we consider zope and zope.app to be standard modules, since they are
-    basically containers.
-    """
+    """Try to remove modules from the standard Python library."""
     filteredDeps = []
     for dep in deps:
         try:
@@ -173,7 +162,7 @@
         if not hasattr(module, '__file__'):
             continue
         dir = os.path.dirname(module.__file__)
-        if dir.startswith(ZOPESRC) and dep.path not in ('zope', 'zope.app'):
+        if dir.startswith(ZOPESRC):
             filteredDeps.append(dep)
     return filteredDeps