Merge branch 'pr/5'

.travis.yml

@@ -5,6 +5,7 @@ python:
   - "3.4"
 
 env:
+  - DJANGO_VERSION=1.9.x
   - DJANGO_VERSION=1.8.x
   - DJANGO_VERSION=1.7.x
   - DJANGO_VERSION=1.6.x

setup.py

@@ -59,8 +59,8 @@ def read(*parts):
     test_suite='.',
     tests_require=tests_require,
     install_requires=[
-        'Django>=1.6,<1.9',
-        'barbeque>=0.2.1,<0.4.0',
+        'Django>=1.6,<1.10',
+        'barbeque>=0.2.1,<1.1.0',
         'Pillow',
     ],
     extras_require={

tox.ini

@@ -10,6 +10,8 @@ dependencies17 =
 	https://github.com/django/django/archive/stable/1.7.x.tar.gz#egg=django
 dependencies18 =
 	https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
+dependencies19 =
+	https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
 
 [testenv:2.7-1.6.x]
 basepython = python2.7
@@ -26,6 +28,11 @@ basepython = python2.7
 deps =
 	{[testenv]dependencies18}
 
+[testenv:2.7-1.9.x]
+basepython = python2.7
+deps =
+	{[testenv]dependencies19}
+
 [testenv:3.4-1.6.x]
 basepython = python3.4
 deps =
@@ -41,6 +48,11 @@ basepython = python3.4
 deps =
 	{[testenv]dependencies18}
 
+[testenv:3.4-1.9.x]
+basepython = python3.4
+deps =
+	{[testenv]dependencies19}
+
 [testenv:docs]
 commands =
 	pip install -e {toxinidir}[docs]

ultimatethumb/thumbnail.py

@@ -1,10 +1,9 @@
 import os
-from collections import namedtuple
+from collections import OrderedDict, namedtuple
 
 from barbeque.commands.imaging import GmConvertCommand
 from barbeque.files import MoveableNamedTemporaryFile
 from django.conf import settings
-from django.utils.datastructures import SortedDict
 
 from .commands import PngquantCommand
 from .storage import thumbnail_storage
@@ -148,7 +147,7 @@ def generate(self, factor=1):
         return True
 
     def get_gm_options(self, factor=1):
-        gm_options = SortedDict()
+        gm_options = OrderedDict()
 
         # Remove any icc profiles to avoid problems.
         gm_options['+profile'] = '"*"'

ultimatethumb/utils.py

@@ -2,14 +2,14 @@
 import json
 import os
 import re
+from collections import OrderedDict
 
 from django.conf import settings
 from django.contrib.staticfiles.finders import find
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.cache import cache
 from django.core.files.storage import default_storage
 from django.core.urlresolvers import reverse
-from django.utils.datastructures import SortedDict
 from django.utils.encoding import force_bytes
 from django.utils.six.moves.urllib import parse as urlparse
 from PIL import Image as PILImage
@@ -27,10 +27,9 @@ def get_cache_key(key):
 
 def get_thumb_name(source, **options):
     source_name, source_ext = os.path.splitext(os.path.basename(source))
-    data = SortedDict()
+    data = OrderedDict()
     data['source'] = source
-    data['opts'] = SortedDict(options)
-    data['opts'].keyOrder = sorted(data['opts'].keyOrder)
+    data['opts'] = OrderedDict(sorted(options.items(), key=lambda i: i[0]))
 
     serialized_data = json.dumps(data)
     hashed_data = hashlib.sha1(force_bytes(serialized_data)).hexdigest()