Fixed #21500 -- Removed imports of deprecated utils.importlib

This commit is contained in:
Baptiste Mispelon 2013-11-24 16:43:24 +01:00
parent d47f794f8f
commit e681b2861d
2 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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