Added setting to allow response methods to be any module, not just ajax.py

dajaxice/__init__.py

@@ -1 +1 @@
-__version__ = (0, 5, 5, 'beta')
+__version__ = (0, 5, 6, 'beta')

dajaxice/core/Dajaxice.py

@@ -1,6 +1,6 @@
 import logging
 
-from django.utils.importlib import import_module
+from importlib import import_module
 
 log = logging.getLogger('dajaxice')
 

dajaxice/finders.py

@@ -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)
 
 

dajaxice/templates/dajaxice/dajaxice.core.js

@@ -1,4 +1,3 @@
-{% load url from future %}
 var Dajaxice = {
 
     {% with module=dajaxice_config.modules top='top' %}
@@ -48,7 +47,7 @@ var Dajaxice = {
         oXMLHttpRequest.setRequestHeader("X-CSRFToken", Dajaxice.get_cookie('{{ dajaxice_config.django_settings.CSRF_COOKIE_NAME }}'));
         oXMLHttpRequest.onreadystatechange = function() {
             if (this.readyState == XMLHttpRequest.DONE) {
-                if(this.responseText == Dajaxice.EXCEPTION || !(this.status in Dajaxice.valid_http_responses())){
+                if(this.status != '' && (this.responseText == Dajaxice.EXCEPTION || !(this.status in Dajaxice.valid_http_responses()))){
                     error_callback();
                 }
                 else{

dajaxice/templatetags/dajaxice_templatetags.py

@@ -4,6 +4,7 @@
 from django.middleware.csrf import get_token
 from django.conf import settings
 from django.core.files.storage import get_storage_class
+from django.utils.html import format_html
 
 staticfiles_storage = get_storage_class(settings.STATICFILES_STORAGE)()
 
@@ -32,4 +33,4 @@ def dajaxice_js_import(context, csrf=True):
                     "and render your views using a RequestContext.")
 
     url = staticfiles_storage.url('dajaxice/dajaxice.core.js')
-    return '<script src="%s" type="text/javascript" charset="utf-8"></script>' % url
+    return format_html('<script src="%s" type="text/javascript" charset="utf-8"></script>' % url)

dajaxice/tests/urls.py

@@ -1,10 +1,10 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import url, include
 
 from dajaxice.core import dajaxice_autodiscover, dajaxice_config
 
 dajaxice_autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     #Dajaxice URLS
     url(dajaxice_config.dajaxice_url, include('dajaxice.urls')),
-)
+]

dajaxice/urls.py

@@ -1,7 +1,7 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import url
 from .views import DajaxiceRequest
 
-urlpatterns = patterns('dajaxice.views',
+urlpatterns = [
     url(r'^(.+)/$', DajaxiceRequest.as_view(), name='dajaxice-call-endpoint'),
     url(r'', DajaxiceRequest.as_view(), name='dajaxice-endpoint'),
-)
+]

dajaxice/views.py

@@ -1,7 +1,8 @@
 import logging
+import json
+import django
 
 from django.conf import settings
-from django.utils import simplejson
 from django.views.generic.base import View
 from django.http import HttpResponse, Http404
 
@@ -41,7 +42,7 @@ def dispatch(self, request, name=None):
             # Clean the argv
             if data != 'undefined':
                 try:
-                    data = safe_dict(simplejson.loads(data))
+                    data = safe_dict(json.loads(data))
                 except Exception:
                     data = {}
             else:
@@ -55,6 +56,9 @@ def dispatch(self, request, name=None):
                     raise
                 response = dajaxice_config.DAJAXICE_EXCEPTION
 
-            return HttpResponse(response, mimetype="application/x-json")
+            if django.get_version() >= '1.7':
+                return HttpResponse(response, content_type="application/x-json")
+            else:
+                return HttpResponse(response, mimetype="application/x-json")
         else:
             raise FunctionNotCallableError(name)

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='django-dajaxice',
-    version='0.5.5',
+    version='0.5.6',
     author='Jorge Bastida',
     author_email='me@jorgebastida.com',
     description='Agnostic and easy to use ajax library for django',