mirror of
				https://github.com/django/django.git
				synced 2025-10-31 01:25:32 +00:00 
			
		
		
		
	Fixed #21500 -- Removed imports of deprecated utils.importlib
This commit is contained in:
		| @@ -28,6 +28,8 @@ | |||||||
| # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | # 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. | # 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 os | ||||||
| import signal | import signal | ||||||
| import sys | import sys | ||||||
| @@ -38,7 +40,7 @@ import traceback | |||||||
| from django.conf import settings | from django.conf import settings | ||||||
| from django.core.signals import request_finished | from django.core.signals import request_finished | ||||||
| from django.utils._os import upath | from django.utils._os import upath | ||||||
| from django.utils.importlib import import_module | from importlib import import_module | ||||||
| from django.utils import six | from django.utils import six | ||||||
| try: | try: | ||||||
|     from django.utils.six.moves import _thread as thread |     from django.utils.six.moves import _thread as thread | ||||||
|   | |||||||
| @@ -3,6 +3,7 @@ | |||||||
| # files to search for such a header to decode the source file content | # files to search for such a header to decode the source file content | ||||||
| from __future__ import unicode_literals | from __future__ import unicode_literals | ||||||
|  |  | ||||||
|  | import importlib | ||||||
| import inspect | import inspect | ||||||
| import os | import os | ||||||
| import re | import re | ||||||
| @@ -19,7 +20,7 @@ from django.test import TestCase, RequestFactory | |||||||
| from django.test.utils import (override_settings, setup_test_template_loader, | from django.test.utils import (override_settings, setup_test_template_loader, | ||||||
|     restore_template_loaders) |     restore_template_loaders) | ||||||
| from django.utils.encoding import force_text, force_bytes | 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 django.views.debug import ExceptionReporter | ||||||
|  |  | ||||||
| from .. import BrokenException, except_args | from .. import BrokenException, except_args | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user