Merge pull request #24 from quiqueporta/master

Compatibility with Django 1.9
disqus · Apr 22, 2016 · e3f4adb · e3f4adb
2 parents 2cc7daf + 129a954
commit e3f4adb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,23 +10,20 @@ python:
     - "3.4"
 
 env:
-    - DJANGO='Django==1.3.*'
-    - DJANGO='Django==1.4.*'
     - DJANGO='Django==1.5.*'
     - DJANGO='Django==1.6.*'
     - DJANGO='Django==1.7.*'
     - DJANGO='Django==1.8.*'
+    - DJANGO='Django==1.9.*'
 
 matrix:
     exclude:
         - env: DJANGO='Django==1.7.*'
           python: "2.6"
         - env: DJANGO='Django==1.8.*'
           python: "2.6"
-        - env: DJANGO='Django==1.3.*'
-          python: "3.4"
-        - env: DJANGO='Django==1.4.*'
-          python: "3.4"
+        - env: DJANGO='Django==1.9.*'
+          python: "2.6"
 
 install:
     - pip install $DJANGO

diff --git a/mailviews/previews.py b/mailviews/previews.py
@@ -13,8 +13,17 @@
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import render
-from django.utils.datastructures import SortedDict
-from django.utils.importlib import import_module
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
+try:
+    from importlib import import_module
+except ImportError:
+    from django.utils.importlib import import_module
+
 from django.utils.module_loading import module_has_submodule
 
 from mailviews.helpers import should_use_staticfiles
@@ -180,7 +189,7 @@ def detail_view(self, request):
 
         message = message_view.render_to_message()
         raw = message.message()
-        headers = SortedDict((header, maybe_decode_header(raw[header])) for header in self.headers)
+        headers = OrderedDict((header, maybe_decode_header(raw[header])) for header in self.headers)
 
         context.update({
             'message': message,

diff --git a/mailviews/templates/mailviews/base.html b/mailviews/templates/mailviews/base.html
@@ -1,4 +1,3 @@
-{% load url from future %}
 <!doctype html>
 <html lang="en">
 <head>

diff --git a/mailviews/tests/__init__.py b/mailviews/tests/__init__.py
@@ -5,6 +5,8 @@
     settings.configure(
         DEBUG=True,
         INSTALLED_APPS=(
+            'django.contrib.auth',
+            'django.contrib.contenttypes',
             'mailviews',
             'mailviews.tests',
         ),

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist:
-    py26-django1.{3,4,5,6},
-    py27-django1.{3,4,5,6,7,8},
-    py34-django1.{5,6,7,8}
+    py26-django1.{5,6},
+    py27-django1.{5,6,7,8,9},
+    py34-django1.{5,6,7,8,9}
 
 [testenv]
 commands = python setup.py test
@@ -11,9 +11,8 @@ basepython =
     py27: python2.7
     py34: python3.4
 deps =
-    django1.3: Django==1.3.*
-    django1.4: Django==1.4.*
     django1.5: Django==1.5.*
     django1.6: Django==1.6.*
     django1.7: Django==1.7.*
     django1.8: Django==1.8.*
+    django1.9: Django==1.9.*