Skip to content

support for Django>=1.9 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion dajaxice/core/Dajaxice.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import logging

from django.utils.importlib import import_module
try:
from django.utils.importlib import import_module
except ImportError:
from importlib import import_module

log = logging.getLogger('dajaxice')

Expand Down
2 changes: 1 addition & 1 deletion dajaxice/finders.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def dajaxice_core_js(self):

dajaxice_autodiscover()

c = Context({'dajaxice_config': dajaxice_config})
c = {'dajaxice_config': dajaxice_config}
return get_template(os.path.join('dajaxice', 'dajaxice.core.js')).render(c)


Expand Down
1 change: 0 additions & 1 deletion dajaxice/templates/dajaxice/dajaxice.core.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{% load url from future %}
var Dajaxice = {

{% with module=dajaxice_config.modules top='top' %}
Expand Down