diff --git a/sloth/conf/__init__.py b/sloth/conf/__init__.py index ce571f7..eaa3bf7 100644 --- a/sloth/conf/__init__.py +++ b/sloth/conf/__init__.py @@ -1,7 +1,8 @@ -from sloth.conf import default_config -from sloth.utils import importlib -import sys import os +import sys +import importlib +from sloth.conf import default_config + class Config: def __init__(self): diff --git a/sloth/core/utils.py b/sloth/core/utils.py index 7c1f733..3d5d9a0 100644 --- a/sloth/core/utils.py +++ b/sloth/core/utils.py @@ -1,5 +1,5 @@ +import importlib from sloth.core import exceptions -from sloth.utils import importlib def import_callable(module_path_name): diff --git a/sloth/utils/importlib.py b/sloth/utils/importlib.py deleted file mode 100644 index c6ea879..0000000 --- a/sloth/utils/importlib.py +++ /dev/null @@ -1,38 +0,0 @@ -# taken from django... - -# Taken from Python 2.7 with permission from/by the original author. -import sys - -def _resolve_name(name, package, level): - """Return the absolute name of the module to be imported.""" - if not hasattr(package, 'rindex'): - raise ValueError("'package' not set to a string") - dot = len(package) - for x in range(level, 1, -1): - try: - dot = package.rindex('.', 0, dot) - except ValueError: - raise ValueError("attempted relative import beyond top-level " - "package") - return "%s.%s" % (package[:dot], name) - - -def import_module(name, package=None): - """Import a module. - - The 'package' argument is required when performing a relative import. It - specifies the package to use as the anchor point from which to resolve the - relative import to an absolute import. - - """ - if name.startswith('.'): - if not package: - raise TypeError("relative imports require the 'package' argument") - level = 0 - for character in name: - if character != '.': - break - level += 1 - name = _resolve_name(name[level:], package, level) - __import__(name) - return sys.modules[name]