Commit e052ada0 authored by Andrey Antukh's avatar Andrey Antukh Committed by Claude Paroz
Browse files

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

Backport of 3351e94f from master.
parent 747f7755
Loading
Loading
Loading
Loading
+22 −17
Original line number Diff line number Diff line
# Taken from Python 2.7 with permission from/by the original author.
import sys

from django.utils import six

def _resolve_name(name, package, level):
    """Return the absolute name of the module to be imported."""
    if not hasattr(package, 'rindex'):
@@ -15,6 +17,9 @@ def _resolve_name(name, package, level):
    return "%s.%s" % (package[:dot], name)


if six.PY3:
    from importlib import import_module
else:
    def import_module(name, package=None):
        """Import a module.