innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #21335 -- Use importlib from python3 when using python3

This commit is contained in:
Andrey Antukh 2013-10-26 01:07:40 +02:00 committed by Claude Paroz
parent 9d740eb8b1
commit 3351e94ffa
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/importlib.py
View File

@ -2,6 +2,8 @@
import warnings import warnings
import sys import sys
from django.utils import six
warnings.warn("django.utils.importlib will be removed in Django 1.9.", warnings.warn("django.utils.importlib will be removed in Django 1.9.",
PendingDeprecationWarning, stacklevel=2) PendingDeprecationWarning, stacklevel=2)
@ -20,7 +22,10 @@ def _resolve_name(name, package, level):
return "%s.%s" % (package[:dot], name) return "%s.%s" % (package[:dot], name)
def import_module(name, package=None): if six.PY3:
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