Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

Revert "[1.5.x] Fixed #21335 -- Use importlib from python3 when using python3"

Browse Source 
This reverts commit 1ef737416ab56a6becee36876769909a37541465.
This would require changing some import_module calls (relative
syntax, see ec0a3f50852), too much for a stable release.
This commit is contained in:
Claude Paroz 2013-10-26 23:29:42 +02:00
parent 1ef737416a
commit 3b4b376bd1
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
django/utils/importlib.py
View File

@ -1,8 +1,6 @@
# Taken from Python 2.7 with permission from/by the original author. # Taken from Python 2.7 with permission from/by the original author.
import sys import sys
from django.utils import six
def _resolve_name(name, package, level): def _resolve_name(name, package, level):
"""Return the absolute name of the module to be imported.""" """Return the absolute name of the module to be imported."""
if not hasattr(package, 'rindex'): if not hasattr(package, 'rindex'):
@ -17,25 +15,22 @@ def _resolve_name(name, package, level):
return "%s.%s" % (package[:dot], name) return "%s.%s" % (package[:dot], name)
if six.PY3: def import_module(name, package=None):
from importlib import import_module """Import a module.
else:
def import_module(name, package=None):
"""Import a module.
The 'package' argument is required when performing a relative import. It 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 specifies the package to use as the anchor point from which to resolve the
relative import to an absolute import. relative import to an absolute import.
""" """
if name.startswith('.'): if name.startswith('.'):
if not package: if not package:
raise TypeError("relative imports require the 'package' argument") raise TypeError("relative imports require the 'package' argument")
level = 0 level = 0
for character in name: for character in name:
if character != '.': if character != '.':
break break
level += 1 level += 1
name = _resolve_name(name[level:], package, level) name = _resolve_name(name[level:], package, level)
__import__(name) __import__(name)
return sys.modules[name] return sys.modules[name]