From 3b4b376bd1dde3cbe64cf8f1a4fb1756904af710 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 26 Oct 2013 23:29:42 +0200
Subject: Revert "[1.5.x] Fixed #21335 -- Use importlib from python3 when using
 python3"

This reverts commit 1ef737416ab56a6becee36876769909a37541465.
This would require changing some import_module calls (relative
syntax, see ec0a3f50852), too much for a stable release.
---
 django/utils/importlib.py | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/django/utils/importlib.py b/django/utils/importlib.py
index ae7987c48b..703ba7f6d8 100644
--- a/django/utils/importlib.py
+++ b/django/utils/importlib.py
@@ -1,8 +1,6 @@
 # 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'):
@@ -17,25 +15,22 @@ 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.
+def import_module(name, package=None):
+    """Import a module.
 
-        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
-        relative import to an absolute import.
+    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
+    relative import to an absolute import.
 
-        """
-        if name.startswith('.'):
-            if not package:
-                raise TypeError("relative imports require the 'package' argument")
-            level = 0
-            for character in name:
-                if character != '.':
-                    break
-                level += 1
-            name = _resolve_name(name[level:], package, level)
-        __import__(name)
-        return sys.modules[name]
+    """
+    if name.startswith('.'):
+        if not package:
+            raise TypeError("relative imports require the 'package' argument")
+        level = 0
+        for character in name:
+            if character != '.':
+                break
+            level += 1
+        name = _resolve_name(name[level:], package, level)
+    __import__(name)
+    return sys.modules[name]
-- 
cgit v1.3