Further Django 1.8 compatibility fixes.

wlanslovenija · Sep 8, 2015 · d2ae7b7 · d2ae7b7
1 parent f226cfa
commit d2ae7b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,10 @@ language: python
 python:
  - 2.7
 env:
- - BEFORE_DJANGO_VERSION=1.8 TASTYPIE_VERSION="==0.9.16"
- - BEFORE_DJANGO_VERSION=1.8 TASTYPIE_VERSION=">=0.9.16"
- - BEFORE_DJANGO_VERSION=1.9 TASTYPIE_VERSION="==0.9.16"
- - BEFORE_DJANGO_VERSION=1.9 TASTYPIE_VERSION=">=0.9.16"
+ - BEFORE_DJANGO_VERSION=1.8 TASTYPIE_VERSION="==0.12.1"
+ - BEFORE_DJANGO_VERSION=1.8 TASTYPIE_VERSION=">=0.12.1"
+ - BEFORE_DJANGO_VERSION=1.9 TASTYPIE_VERSION="==0.12.1"
+ - BEFORE_DJANGO_VERSION=1.9 TASTYPIE_VERSION=">=0.12.1"
 services: mongodb
 install:
  - pip install "Django<$BEFORE_DJANGO_VERSION"

diff --git a/django_datastream/management/commands/dummystream.py b/django_datastream/management/commands/dummystream.py
@@ -6,7 +6,12 @@
 import time
 
 from django.core.management import base
-from django.contrib.webdesign import lorem_ipsum
+
+try:
+    # Moved in Django 1.8
+    from django.utils import lorem_ipsum
+except ImportError:
+    from django.contrib.webdesign import lorem_ipsum
 
 import pytz
 

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
         install_requires=[
             'Django>=1.7',
             'datastream>=0.4.10',
-            'django-tastypie>=0.9.16',
+            'django-tastypie>=0.12.1',
             'ujson==1.34',
             'pytz>=2012h',
             'mimeparse>=0.1.3',