From 3351e94ffa37d3824a49b687125ee4a430b69bbe Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 26 Oct 2013 01:07:40 +0200 Subject: [PATCH] Fixed #21335 -- Use importlib from python3 when using python3 --- django/utils/importlib.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/django/utils/importlib.py b/django/utils/importlib.py index 26e45589e3..483cea5f94 100644 --- a/django/utils/importlib.py +++ b/django/utils/importlib.py @@ -2,6 +2,8 @@ import warnings import sys +from django.utils import six + warnings.warn("django.utils.importlib will be removed in Django 1.9.", PendingDeprecationWarning, stacklevel=2) @@ -20,22 +22,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]