File tree 6 files changed +25
-6
lines changed
6 files changed +25
-6
lines changed Original file line number Diff line number Diff line change 4
4
5
5
from __future__ import absolute_import , unicode_literals
6
6
7
+ try :
8
+ from importlib import import_module
9
+ except ImportError : # python 2.6
10
+ from django .utils .importlib import import_module
7
11
import re
8
12
import threading
9
13
10
14
from django .conf import settings
11
15
from django .utils .encoding import force_text
12
- from django .utils .importlib import import_module
13
16
14
17
from debug_toolbar .toolbar import DebugToolbar
15
18
from debug_toolbar import settings as dt_settings
Original file line number Diff line number Diff line change 1
1
from __future__ import absolute_import , unicode_literals
2
2
3
+ try :
4
+ from importlib import import_module
5
+ except ImportError : # python 2.6
6
+ from django .utils .importlib import import_module
7
+
3
8
from django .core .signals import (
4
9
request_started , request_finished , got_request_exception )
5
10
from django .db .backends .signals import connection_created
12
17
import weakref
13
18
WEAKREF_TYPES = weakref .ReferenceType ,
14
19
from django .utils .translation import ugettext_lazy as _ , ungettext
15
- from django .utils .importlib import import_module
16
20
17
21
from debug_toolbar .panels import Panel
18
22
Original file line number Diff line number Diff line change 1
1
from __future__ import absolute_import , unicode_literals
2
2
3
+ try :
4
+ from importlib import import_module
5
+ except ImportError : # python 2.6
6
+ from django .utils .importlib import import_module
3
7
import sys
4
8
5
9
import django
6
10
from django .conf import settings
7
- from django .utils .importlib import import_module
8
11
from django .utils .translation import ugettext_lazy as _
9
12
try :
10
13
from collections import OrderedDict
Original file line number Diff line number Diff line change 1
1
from __future__ import absolute_import , unicode_literals
2
2
3
+ try :
4
+ from importlib import import_module
5
+ except ImportError : # python 2.6
6
+ from django .utils .importlib import import_module
3
7
import warnings
4
8
5
9
from django .conf import settings
6
- from django .utils .importlib import import_module
7
10
from django .utils import six
8
11
9
12
Original file line number Diff line number Diff line change 4
4
5
5
from __future__ import absolute_import , unicode_literals
6
6
7
+ try :
8
+ from importlib import import_module
9
+ except ImportError : # python 2.6
10
+ from django .utils .importlib import import_module
7
11
import uuid
8
12
9
13
import django
12
16
from django .core .exceptions import ImproperlyConfigured
13
17
from django .template import TemplateSyntaxError
14
18
from django .template .loader import render_to_string
15
- from django .utils .importlib import import_module
16
19
try :
17
20
from collections import OrderedDict
18
21
except ImportError :
Original file line number Diff line number Diff line change 1
1
from __future__ import absolute_import , unicode_literals
2
2
3
+ try :
4
+ from importlib import import_module
5
+ except ImportError : # python 2.6
6
+ from django .utils .importlib import import_module
3
7
import inspect
4
8
import os .path
5
9
import re
13
17
from django .core .exceptions import ImproperlyConfigured
14
18
from django .utils .encoding import force_text
15
19
from django .utils .html import escape
16
- from django .utils .importlib import import_module
17
20
from django .utils .safestring import mark_safe
18
21
from django .utils import six
19
22
from django .views .debug import linebreak_iter
You can’t perform that action at this time.
0 commit comments