mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-23 18:29:12 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
Backport of 3351e94ffa from master.
This commit is contained in:
Andrey Antukh 2013-10-26 01:07:40 +02:00 committed by Claude Paroz
parent 4b4b795bd5
commit 1ef737416a
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/utils/importlib.py
View File

@ -1,6 +1,8 @@
# 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'):
@ -15,6 +17,9 @@ def _resolve_name(name, package, level):
return "%s.%s" % (package[:dot], name) return "%s.%s" % (package[:dot], name)
if six.PY3:
from importlib import import_module
else:
def import_module(name, package=None): def import_module(name, package=None):
"""Import a module. """Import a module.