Keep submodule name when we don't globally import its content (fix #471)

tensorpack/callbacks/__init__.py

@@ -12,6 +12,7 @@ __all__ = []
 def _global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else dir(p)
+    if lst:
         del globals()[name]
         for k in lst:
             if not k.startswith('__'):

tensorpack/dataflow/__init__.py

@@ -13,6 +13,7 @@ __all__ = []
 def _global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else dir(p)
+    if lst:
         del globals()[name]
         for k in lst:
             if not k.startswith('__'):

tensorpack/dataflow/dataset/__init__.py

@@ -12,6 +12,7 @@ __all__ = []
 def global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else dir(p)
+    if lst:
         del globals()[name]
         for k in lst:
             if not k.startswith('__'):

tensorpack/dataflow/imgaug/__init__.py

@@ -11,6 +11,7 @@ __all__ = []
 def global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else dir(p)
+    if lst:
         del globals()[name]
         for k in lst:
             if not k.startswith('__'):

tensorpack/predict/__init__.py

@@ -12,6 +12,7 @@ __all__ = []
 def global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else dir(p)
+    if lst:
         del globals()[name]
         for k in lst:
             globals()[k] = p.__dict__[k]

tensorpack/train/__init__.py

@@ -12,6 +12,7 @@ __all__ = []
 def global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else []
+    if lst:
         del globals()[name]
         for k in lst:
             globals()[k] = p.__dict__[k]

tests/run-tests.sh

@@ -6,6 +6,9 @@ DIR=$(dirname $0)
 cd $DIR
 
 export TF_CPP_MIN_LOG_LEVEL=2
+# test import (#471)
+python -c 'from tensorpack.dataflow.imgaug import transform'
+
 python -m unittest discover -v
 # python -m tensorpack.models._test
 # segfault for no reason (https://travis-ci.org/ppwwyyxx/tensorpack/jobs/217702985)