Upgrade suport to django 1.9

valdergallo · Dec 14, 2015 · a375b07 · a375b07
1 parent a3bafd8
commit a375b07
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/data_importer/models.py b/data_importer/models.py
@@ -22,8 +22,9 @@
 # from django.contrib.auth import get_user_model
 User = settings.AUTH_USER_MODEL
 
+DJANGO_VERSION = float(django.get_version())
 
-if float(django.get_version()) < 1.7:
+if DJANGO_VERSION > 1.7:
     from django.contrib.contenttypes.fields import GenericForeignKey  # for Django > 1.7
 else:
     from django.contrib.contenttypes.generic import GenericForeignKey  # for Django < 1.9

diff --git a/data_importer/writers/utils.py b/data_importer/writers/utils.py
@@ -125,7 +125,7 @@ def save(self, compress=True, filename=None):
 
     def response(self, compress=True, filename=None):
         from django.http import HttpResponse
-        from django.core.servers.basehttp import FileWrapper
+        from wsgiref.util import FileWrapper
 
         if compress:
             response = HttpResponse(FileWrapper(self.get_compressed_file()))

diff --git a/tox.ini b/tox.ini
@@ -5,8 +5,8 @@
 
 [tox]
 skipsdist = true
-envlist = py27-django{13,14,15,16}
-# envlist = py27-django{12,13,14,15,16,17,18,19},
+# envlist = py27-django{13,14,15,16}
+envlist = py27-django{12,13,14,15,16,17,18,19},
 
 
 [testenv]