[WIP]: use pkgutil

Author: woodruffw

support/walk-modules.py

@@ -1,11 +1,43 @@
 #!/usr/bin/env python
 
 import inspect
+import pkgutil
 import sys
 
 SEEN_MODS = set()
 
 
+def walk_pkgutil(mod_name, mod):
+    for pkg in pkgutil.walk_packages(mod.__path__, mod_name + "."):
+        walk(pkg.name)
+
+
+def walk_naive(mod_name, mod):
+    for attr in dir(mod):
+        attr_obj = getattr(mod, attr, None)
+        # Shouldn't happen, but who knows.
+        if attr_obj is None:
+            continue
+
+        # If this member isn't a module, skip it.
+        if not inspect.ismodule(attr_obj):
+            continue
+
+        # To filter "real" submodules from re-exports, we try
+        # and import the submodule by its qualified name.
+        # If the import fails, we know it's a re-exported module.
+        try:
+            submod_name = mod_name + "." + attr
+            __import__(submod_name)
+            walk(submod_name)
+        except ImportError:
+            # ...but sometimes we do want to include re-exports, since
+            # they might be things like "accelerator" modules that don't
+            # appear anywhere else.
+            # For example, `_bz2` might appear as a re-export.
+            walk(attr)
+
+
 def walk(mod_name):
     if mod_name in SEEN_MODS:
         return
@@ -16,29 +48,12 @@ def walk(mod_name):
     # Try and import it.
     try:
         mod = __import__(mod_name)
-        for attr in dir(mod):
-            attr_obj = getattr(mod, attr, None)
-            # Shouldn't happen, but who knows.
-            if attr_obj is None:
-                continue
-
-            # If this member isn't a module, skip it.
-            if not inspect.ismodule(attr_obj):
-                continue
-
-            # To filter "real" submodules from re-exports, we try
-            # and import the submodule by its qualified name.
-            # If the import fails, we know it's a re-exported module.
-            try:
-                submod_name = mod_name + "." + attr
-                __import__(submod_name)
-                walk(submod_name)
-            except ImportError:
-                # ...but sometimes we do want to include re-exports, since
-                # they might be things like "accelerator" modules that don't
-                # appear anywhere else.
-                # For example, `_bz2` might appear as a re-export.
-                walk(attr)
+
+        if hasattr(mod, "__path__"):
+            walk_pkgutil(mod_name, mod)
+        else:
+            walk_naive(mod_name, mod)
+
     except ImportError:
         pass