diff options
| author | Baptiste Mispelon <bmispelon@gmail.com> | 2013-11-24 16:43:24 +0100 |
|---|---|---|
| committer | Baptiste Mispelon <bmispelon@gmail.com> | 2013-11-24 16:45:01 +0100 |
| commit | e681b2861d969eb5c5cd27ec8a9a14ebc8860bd1 (patch) | |
| tree | 89454bc4ea0f29ba3388854da5704ff8fb64fb30 | |
| parent | d47f794f8fa05591632b8cad4b134858e7ae140d (diff) | |
Fixed #21500 -- Removed imports of deprecated utils.importlib
| -rw-r--r-- | django/utils/autoreload.py | 4 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_debug.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py index 1b15c32874..4b0a97f12b 100644 --- a/django/utils/autoreload.py +++ b/django/utils/autoreload.py @@ -28,6 +28,8 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +from __future__ import absolute_import # Avoid importing `importlib` from this package. + import os import signal import sys @@ -38,7 +40,7 @@ import traceback from django.conf import settings from django.core.signals import request_finished from django.utils._os import upath -from django.utils.importlib import import_module +from importlib import import_module from django.utils import six try: from django.utils.six.moves import _thread as thread diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index 3805ce50e0..7be5b43a96 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -3,6 +3,7 @@ # files to search for such a header to decode the source file content from __future__ import unicode_literals +import importlib import inspect import os import re @@ -19,7 +20,7 @@ from django.test import TestCase, RequestFactory from django.test.utils import (override_settings, setup_test_template_loader, restore_template_loaders) from django.utils.encoding import force_text, force_bytes -from django.utils import importlib, six +from django.utils import six from django.views.debug import ExceptionReporter from .. import BrokenException, except_args |
