Skip to content

Commit

Permalink
Merge pull request #72 from jazzband/hotfix/django_import
Browse files Browse the repository at this point in the history
Use native importlib istead of Django version.
  • Loading branch information
michaelkuty committed Jan 7, 2016
2 parents a3334a0 + d1b83e1 commit 7619f9f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ script:
- coverage run --branch --source=dbtemplates `which django-admin.py` test dbtemplates
- coverage report --omit="dbtemplates/test*,dbtemplates/migrations*"
env:
- DJANGO=1.4.5
- DJANGO=1.5.1
- DJANGO="1.4.5 importlib"
- DJANGO="1.5.1 importlib"
- DJANGO=1.7.8
- DJANGO=1.8
matrix:
Expand Down
2 changes: 1 addition & 1 deletion dbtemplates/utils/template.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django import VERSION
from django.template import (Template, TemplateDoesNotExist,
TemplateSyntaxError)
from django.utils.importlib import import_module
from importlib import import_module


def get_loaders():
Expand Down

0 comments on commit 7619f9f

Please sign in to comment.