diff --git a/django/utils/importlib.py b/django/utils/importlib.py index 703ba7f6d8..ae7987c48b 100644 --- a/django/utils/importlib.py +++ b/django/utils/importlib.py @@ -1,6 +1,8 @@ # Taken from Python 2.7 with permission from/by the original author. import sys +from django.utils import six + def _resolve_name(name, package, level): """Return the absolute name of the module to be imported.""" if not hasattr(package, 'rindex'): @@ -15,22 +17,25 @@ def _resolve_name(name, package, level): return "%s.%s" % (package[:dot], name) -def import_module(name, package=None): - """Import a module. +if six.PY3: + from importlib import import_module +else: + 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. + 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] + """ + 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]