Standard importlib first
This commit is contained in:
parent
eb6b197d04
commit
e0cc26553f
@ -8,6 +8,7 @@ env:
|
||||
- TOX_ENV=py33-1.8
|
||||
- TOX_ENV=py34-1.7
|
||||
- TOX_ENV=py34-1.8
|
||||
- TOX_ENV=py35-1.8
|
||||
install:
|
||||
- pip install tox
|
||||
script:
|
||||
|
@ -10,7 +10,11 @@ from django.apps import apps
|
||||
from django.conf import settings
|
||||
from django.template.base import Origin, TemplateDoesNotExist
|
||||
from django.template.loader import BaseLoader
|
||||
from django.utils.importlib import import_module
|
||||
|
||||
try:
|
||||
from importlib import import_module
|
||||
except ImportError:
|
||||
from django.utils.importlib import import_module
|
||||
|
||||
try:
|
||||
import importlib.util
|
||||
|
8
tox.ini
8
tox.ini
@ -7,7 +7,7 @@ commands =
|
||||
python run_tests.py
|
||||
deps =
|
||||
sphinx
|
||||
jinja2==2.7
|
||||
jinja2
|
||||
nose
|
||||
mock
|
||||
|
||||
@ -46,3 +46,9 @@ basepython = python3.4
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py35-1.8]
|
||||
basepython = python3.5
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
Loading…
x
Reference in New Issue
Block a user