support django 1.6.x

Author: chfw

_compact.py

@@ -0,0 +1,9 @@
+try:
+    from django.http import JsonResponse
+except ImportError:
+    from django.http import HttpResponse
+    import json
+
+    def JsonResponse(data):
+        return HttpResponse(json.dumps(data),
+                            content_type="application/json")

django_excel/__init__.py

@@ -15,6 +15,7 @@
 from django.http import HttpResponse
 import pyexcel as pe
 import pyexcel_webio as webio
+from ._compact import DJANGO_ONE_SIX
 
 
 class ExcelMixin(webio.ExcelInput):
@@ -78,15 +79,17 @@ def file_complete(self, file_size):
         if not self.activated:
             return
         self.file.seek(0)
-        return ExcelInMemoryUploadedFile(
+        keywords = dict(
             file=self.file,
             field_name=self.field_name,
             name=self.file_name,
             content_type=self.content_type,
             size=file_size,
-            charset=self.charset,
-            content_type_extra=self.content_type_extra
+            charset=self.charset
         )
+        if not DJANGO_ONE_SIX:
+            keywords["content_type_extra"] = self.content_type_extra
+        return ExcelInMemoryUploadedFile(**keywords)
 
 
 class TemporaryExcelFileUploadHandler(TemporaryFileUploadHandler):
@@ -101,12 +104,14 @@ def new_file(self, file_name, *args, **kwargs):
             file_name,
             *args,
             **kwargs)
-        self.file = TemporaryUploadedExcelFile(
+        custom_args = [
             self.file_name,
             self.content_type,
             0,
-            self.charset,
-            self.content_type_extra)
+            self.charset]
+        if not DJANGO_ONE_SIX:
+            custom_args.append(self.content_type_extra)
+        self.file = TemporaryUploadedExcelFile(*custom_args)
 
 
 def _make_response(content, content_type, status, file_name=None):

django_excel/_compact.py

@@ -0,0 +1,11 @@
+import pkg_resources
+from distutils.version import LooseVersion
+
+
+django_version = pkg_resources.get_distribution('django').version
+
+
+DJANGO_ONE_SIX = (
+    LooseVersion(django_version) < LooseVersion("1.7.0") and
+    LooseVersion(django_version) > LooseVersion("1.5.12")
+)

mysite/settings.py

@@ -10,6 +10,7 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 
@@ -49,11 +50,11 @@
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware'
 )
 
+
 ROOT_URLCONF = 'mysite.urls'
 
 WSGI_APPLICATION = 'mysite.wsgi.application'

polls/views.py

@@ -1,5 +1,6 @@
 from django.shortcuts import render
-from django.http import HttpResponseBadRequest, JsonResponse, HttpResponse
+from django.http import HttpResponseBadRequest, HttpResponse
+from _compact import JsonResponse
 from django import forms
 import django_excel as excel
 from polls.models import Question, Choice

requirements.txt

@@ -1,3 +1,3 @@
 pyexcel>=0.2.2
 pyexcel-webio>=0.0.7
-Django>=1.7.1
+Django>=1.4.1