Commit c003b1c1 authored by Yuxin Wu's avatar Yuxin Wu

use iter_modules to import everyfile. fix #114.

parent a51e2de4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
import os.path import os.path
...@@ -18,7 +18,7 @@ def _global_import(name): ...@@ -18,7 +18,7 @@ def _global_import(name):
__all__.append(k) __all__.append(k)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[os.path.dirname(__file__)]): [os.path.dirname(__file__)]):
if not module_name.startswith('_'): if not module_name.startswith('_'):
_global_import(module_name) _global_import(module_name)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
...@@ -19,7 +19,7 @@ def _global_import(name): ...@@ -19,7 +19,7 @@ def _global_import(name):
_CURR_DIR = os.path.dirname(__file__) _CURR_DIR = os.path.dirname(__file__)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[_CURR_DIR]): [_CURR_DIR]):
srcpath = os.path.join(_CURR_DIR, module_name + '.py') srcpath = os.path.join(_CURR_DIR, module_name + '.py')
if not os.path.isfile(srcpath): if not os.path.isfile(srcpath):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
import os.path import os.path
...@@ -22,7 +22,7 @@ def _global_import(name): ...@@ -22,7 +22,7 @@ def _global_import(name):
__SKIP = ['dftools', 'dataset', 'imgaug'] __SKIP = ['dftools', 'dataset', 'imgaug']
for _, module_name, _ in walk_packages( for _, module_name, __ in iter_modules(
[os.path.dirname(__file__)]): [os.path.dirname(__file__)]):
if not module_name.startswith('_') and \ if not module_name.startswith('_') and \
module_name not in __SKIP: module_name not in __SKIP:
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
import os.path import os.path
...@@ -19,7 +19,7 @@ def global_import(name): ...@@ -19,7 +19,7 @@ def global_import(name):
_CURR_DIR = os.path.dirname(__file__) _CURR_DIR = os.path.dirname(__file__)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[_CURR_DIR]): [_CURR_DIR]):
srcpath = os.path.join(_CURR_DIR, module_name + '.py') srcpath = os.path.join(_CURR_DIR, module_name + '.py')
if not os.path.isfile(srcpath): if not os.path.isfile(srcpath):
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
import os import os
from pkgutil import walk_packages from pkgutil import iter_modules
__all__ = [] __all__ = []
...@@ -17,7 +17,7 @@ def global_import(name): ...@@ -17,7 +17,7 @@ def global_import(name):
__all__.append(k) __all__.append(k)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[os.path.dirname(__file__)]): [os.path.dirname(__file__)]):
if not module_name.startswith('_'): if not module_name.startswith('_'):
global_import(module_name) global_import(module_name)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
from types import ModuleType from types import ModuleType
import six import six
import os import os
...@@ -23,7 +23,7 @@ def _global_import(name): ...@@ -23,7 +23,7 @@ def _global_import(name):
__all__.append(k) __all__.append(k)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[os.path.dirname(__file__)]): [os.path.dirname(__file__)]):
if not module_name.startswith('_'): if not module_name.startswith('_'):
_global_import(module_name) _global_import(module_name)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
import os.path import os.path
...@@ -19,7 +19,7 @@ def global_import(name): ...@@ -19,7 +19,7 @@ def global_import(name):
_CURR_DIR = os.path.dirname(__file__) _CURR_DIR = os.path.dirname(__file__)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[_CURR_DIR]): [_CURR_DIR]):
srcpath = os.path.join(_CURR_DIR, module_name + '.py') srcpath = os.path.join(_CURR_DIR, module_name + '.py')
if not os.path.isfile(srcpath): if not os.path.isfile(srcpath):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
__all__ = [] __all__ = []
...@@ -25,7 +25,7 @@ _TO_IMPORT = set([ ...@@ -25,7 +25,7 @@ _TO_IMPORT = set([
]) ])
_CURR_DIR = os.path.dirname(__file__) _CURR_DIR = os.path.dirname(__file__)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[_CURR_DIR]): [_CURR_DIR]):
srcpath = os.path.join(_CURR_DIR, module_name + '.py') srcpath = os.path.join(_CURR_DIR, module_name + '.py')
if not os.path.isfile(srcpath): if not os.path.isfile(srcpath):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
import os.path import os.path
...@@ -19,7 +19,7 @@ def global_import(name): ...@@ -19,7 +19,7 @@ def global_import(name):
_CURR_DIR = os.path.dirname(__file__) _CURR_DIR = os.path.dirname(__file__)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[_CURR_DIR]): [_CURR_DIR]):
srcpath = os.path.join(_CURR_DIR, module_name + '.py') srcpath = os.path.join(_CURR_DIR, module_name + '.py')
if not os.path.isfile(srcpath): if not os.path.isfile(srcpath):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
from pkgutil import walk_packages from pkgutil import iter_modules
import os import os
""" """
...@@ -28,7 +28,7 @@ _TO_IMPORT = set([ ...@@ -28,7 +28,7 @@ _TO_IMPORT = set([
]) ])
_CURR_DIR = os.path.dirname(__file__) _CURR_DIR = os.path.dirname(__file__)
for _, module_name, _ in walk_packages( for _, module_name, _ in iter_modules(
[_CURR_DIR]): [_CURR_DIR]):
srcpath = os.path.join(_CURR_DIR, module_name + '.py') srcpath = os.path.join(_CURR_DIR, module_name + '.py')
if not os.path.isfile(srcpath): if not os.path.isfile(srcpath):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment