mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-24 02:39:14 +00:00
Code Issues 32 Releases Wiki 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

7
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,10 +15,7 @@ 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
else:
def import_module(name, package=None):
"""Import a module. """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