Test public symbols vs. per-module __all__ lists.

1 files changed, 64 insertions, 7 deletions

diff --git a/python/skytools/__init__.py b/python/skytools/__init__.py
index 8b00d59d..c3b4f00a 100644
--- a/python/skytools/__init__.py
+++ b/python/skytools/__init__.py
@@ -142,17 +142,74 @@ __all__ = _symbols.keys()
 _symbols['__version__'] = 'skytools.installer_config:package_version'
 
 if 1:
+    # lazy-import exported vars
     import skytools.apipkg as _apipkg
     _apipkg.initpkg(__name__, _symbols, {'apipkg': _apipkg})
-else:
-    from skytools.timeutil import *
-    from skytools.gzlog import *
-    from skytools.config import *
+elif 1:
+    # import everything immediately
     from skytools.quoting import *
-    from skytools.parsing import *
     from skytools.sqltools import *
-    from skytools.psycopgwrapper import *
-    from skytools.dbstruct import *
     from skytools.scripting import *
+
     from skytools.adminscript import *
+    from skytools.config import *
+    from skytools.dbservice import *
+    from skytools.dbstruct import *
+    from skytools.fileutil import *
+    from skytools.gzlog import *
+    from skytools.natsort import *
+    from skytools.parsing import *
+    from skytools.psycopgwrapper import *
     from skytools.querybuilder import *
+    from skytools.skylog import *
+    from skytools.sockutil import *
+    from skytools.timeutil import *
+    from skytools.utf8 import *
+else:
+    from skytools.quoting import *
+    from skytools.sqltools import *
+    from skytools.scripting import *
+
+    # compare apipkg list to submodule exports
+    xall = []
+    import skytools.adminscript
+    import skytools.config
+    import skytools.dbservice
+    import skytools.dbstruct
+    import skytools.fileutil
+    import skytools.gzlog
+    import skytools.natsort
+    import skytools.parsing
+    import skytools.psycopgwrapper
+    import skytools.querybuilder
+    import skytools.quoting
+    import skytools.scripting
+    import skytools.skylog
+    import skytools.sockutil
+    import skytools.sqltools
+    import skytools.timeutil
+    import skytools.utf8
+    xall = (  skytools.adminscript.__all__
+            + skytools.config.__all__
+            + skytools.dbservice.__all__
+            + skytools.dbstruct.__all__
+            + skytools.fileutil.__all__
+            + skytools.gzlog.__all__
+            + skytools.natsort.__all__
+            + skytools.parsing.__all__
+            + skytools.psycopgwrapper.__all__
+            + skytools.querybuilder.__all__
+            + skytools.quoting.__all__
+            + skytools.scripting.__all__
+            + skytools.skylog.__all__
+            + skytools.sockutil.__all__
+            + skytools.sqltools.__all__
+            + skytools.timeutil.__all__
+            + skytools.utf8.__all__ )
+    for k in __all__:
+        if k not in xall:
+            print '%s missing from __all__?' % k
+    for k in xall:
+        if k not in __all__:
+            print '%s missing from top-level?' % k
+