Skip to content

Commit 620c543

Browse files
collinandersontim-schilling
authored andcommitted
Removed importlib deprecation warning on django master.
1 parent 417e83c commit 620c543

File tree

6 files changed

+25
-6
lines changed

6 files changed

+25
-6
lines changed

debug_toolbar/middleware.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44

55
from __future__ import absolute_import, unicode_literals
66

7+
try:
8+
from importlib import import_module
9+
except ImportError: # python 2.6
10+
from django.utils.importlib import import_module
711
import re
812
import threading
913

1014
from django.conf import settings
1115
from django.utils.encoding import force_text
12-
from django.utils.importlib import import_module
1316

1417
from debug_toolbar.toolbar import DebugToolbar
1518
from debug_toolbar import settings as dt_settings

debug_toolbar/panels/signals.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
from __future__ import absolute_import, unicode_literals
22

3+
try:
4+
from importlib import import_module
5+
except ImportError: # python 2.6
6+
from django.utils.importlib import import_module
7+
38
from django.core.signals import (
49
request_started, request_finished, got_request_exception)
510
from django.db.backends.signals import connection_created
@@ -12,7 +17,6 @@
1217
import weakref
1318
WEAKREF_TYPES = weakref.ReferenceType,
1419
from django.utils.translation import ugettext_lazy as _, ungettext
15-
from django.utils.importlib import import_module
1620

1721
from debug_toolbar.panels import Panel
1822

debug_toolbar/panels/versions.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
from __future__ import absolute_import, unicode_literals
22

3+
try:
4+
from importlib import import_module
5+
except ImportError: # python 2.6
6+
from django.utils.importlib import import_module
37
import sys
48

59
import django
610
from django.conf import settings
7-
from django.utils.importlib import import_module
811
from django.utils.translation import ugettext_lazy as _
912
try:
1013
from collections import OrderedDict

debug_toolbar/settings.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
from __future__ import absolute_import, unicode_literals
22

3+
try:
4+
from importlib import import_module
5+
except ImportError: # python 2.6
6+
from django.utils.importlib import import_module
37
import warnings
48

59
from django.conf import settings
6-
from django.utils.importlib import import_module
710
from django.utils import six
811

912

debug_toolbar/toolbar.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
from __future__ import absolute_import, unicode_literals
66

7+
try:
8+
from importlib import import_module
9+
except ImportError: # python 2.6
10+
from django.utils.importlib import import_module
711
import uuid
812

913
import django
@@ -12,7 +16,6 @@
1216
from django.core.exceptions import ImproperlyConfigured
1317
from django.template import TemplateSyntaxError
1418
from django.template.loader import render_to_string
15-
from django.utils.importlib import import_module
1619
try:
1720
from collections import OrderedDict
1821
except ImportError:

debug_toolbar/utils.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from __future__ import absolute_import, unicode_literals
22

3+
try:
4+
from importlib import import_module
5+
except ImportError: # python 2.6
6+
from django.utils.importlib import import_module
37
import inspect
48
import os.path
59
import re
@@ -13,7 +17,6 @@
1317
from django.core.exceptions import ImproperlyConfigured
1418
from django.utils.encoding import force_text
1519
from django.utils.html import escape
16-
from django.utils.importlib import import_module
1720
from django.utils.safestring import mark_safe
1821
from django.utils import six
1922
from django.views.debug import linebreak_iter

0 commit comments

Comments
 (0)