Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

… python3"

This reverts commit 1ef7374.
This would require changing some import_module calls (relative
syntax, see ec0a3f5), too much for a stable release.
  • Loading branch information...
commit 3b4b376bd1dde3cbe64cf8f1a4fb1756904af710 1 parent 1ef7374
@claudep claudep authored
Showing with 17 additions and 22 deletions.
  1. +17 −22 django/utils/importlib.py
View
39 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]
Please sign in to comment.
Something went wrong with that request. Please try again.