diff --git a/django/utils/importlib.py b/django/utils/importlib.py deleted file mode 100644 index f05638e2e8..0000000000 --- a/django/utils/importlib.py +++ /dev/null @@ -1,47 +0,0 @@ -# Taken from Python 2.7 with permission from/by the original author. -import warnings -import sys - -from django.utils import six -from django.utils.deprecation import RemovedInDjango19Warning - - -warnings.warn("django.utils.importlib will be removed in Django 1.9.", - RemovedInDjango19Warning, stacklevel=2) - - -def _resolve_name(name, package, level): - """Return the absolute name of the module to be imported.""" - if not hasattr(package, 'rindex'): - raise ValueError("'package' not set to a string") - dot = len(package) - for x in range(level, 1, -1): - try: - dot = package.rindex('.', 0, dot) - except ValueError: - raise ValueError("attempted relative import beyond top-level package") - return "%s.%s" % (package[:dot], name) - - -if six.PY3: - from importlib import import_module -else: - 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. - - """ - 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] diff --git a/tests/.coveragerc b/tests/.coveragerc index 7e04971236..f32b4d6726 100644 --- a/tests/.coveragerc +++ b/tests/.coveragerc @@ -1,5 +1,5 @@ [run] -omit = */django/contrib/*/tests*,*/django/utils/unittest*,*/django/utils/importlib.py,*/django/core/servers/fastcgi.py,*/django/utils/autoreload.py +omit = */django/contrib/*/tests*,*/django/utils/unittest*,*/django/core/servers/fastcgi.py,*/django/utils/autoreload.py [report] ignore_errors = True