Added Django 2.2 & 3.0 to testing matrix (with fixes). Bumped Python version to 3.7.

Author: David Krauth

.gitignore

@@ -6,3 +6,4 @@ build
 ghostdriver.log
 test/media
 dist/
+.python-version

.travis.yml

@@ -18,13 +18,19 @@ matrix:
     - { python: 2.7, env: S3=0 TOXENV=py27-dj111 }
     - { python: 2.7, env: S3=1 TOXENV=py27-dj111 }
     - { python: 2.7, env: S3=0 TOXENV=py27-dj111-grp }
-    - { python: 3.6, env: S3=0 TOXENV=py36-dj111 }
-    - { python: 3.6, env: S3=0 TOXENV=py36-dj20 }
-    - { python: 3.6, env: S3=1 TOXENV=py36-dj20 }
-    - { python: 3.6, env: S3=0 TOXENV=py36-dj20-grp }
-    - { python: 3.6, env: S3=0 TOXENV=py36-dj21 }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj111 }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj20 }
+    - { python: 3.7, env: S3=1 TOXENV=py37-dj20 }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj20-grp }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj21 }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj22 }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj22-grp }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj30 }
+    - { python: 3.7, env: S3=0 TOXENV=py37-dj30-grp }
   allow_failures:
-    - env: S3=0 TOXENV=py36-dj21
+    - env:
+        S3=0 TOXENV=py37-dj30
+        S3=0 TOXENV=py37-dj30-grp
 
 cache: pip
 

cropduster/__init__.py

@@ -1 +1 @@
-__version__ = '4.12.8'
+__version__ = '4.12.9'

cropduster/exceptions.py

@@ -4,15 +4,15 @@
 import copy
 import errno
 
+import six
+from six.moves import xrange
+
 try:
     from django.urls import get_urlconf, get_resolver
 except ImportError:
     from django.core.urlresolvers import get_urlconf, get_resolver
 from django.http import HttpResponse
 from django.utils.safestring import mark_safe
-from django.utils import six
-from django.utils.six.moves import xrange
-
 from django.utils.encoding import force_text
 
 

cropduster/fields.py

@@ -1,14 +1,14 @@
 import contextlib
 from operator import attrgetter
 
+import six
 import django
 from django import forms
 from django.db import models, transaction, router, DEFAULT_DB_ALIAS
 from django.db.models.fields import Field
 from django.db.models.fields.files import ImageFileDescriptor, ImageFieldFile
 from django.db.models.fields.related import ManyToManyRel, ManyToManyField
 from django.utils.functional import cached_property
-from django.utils import six
 from django.contrib.contenttypes.models import ContentType
 
 from generic_plus.fields import GenericForeignFileField

cropduster/files.py

@@ -4,15 +4,16 @@
 import re
 import hashlib
 
+from six.moves.urllib import parse as urlparse
+from six.moves.urllib.request import urlopen
+
 from django.core.files.images import get_image_dimensions
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.files.storage import default_storage
 from django.conf import settings
 from django.db.models.fields.files import FieldFile, FileField
 from django.utils.functional import cached_property
 from django.utils.http import urlunquote_plus
-from django.utils.six.moves.urllib import parse as urlparse
-from django.utils.six.moves.urllib.request import urlopen
 
 from generic_plus.utils import get_relative_media_url, get_media_path
 

cropduster/forms.py

@@ -1,11 +1,11 @@
+import six
 from django import forms
 from django.core.exceptions import ValidationError
 from django.forms.models import ModelChoiceIterator
 from django.forms.models import ChoiceField, ModelMultipleChoiceField
 from django.forms.utils import flatatt
 from django.utils.encoding import force_text
 from django.utils.html import escape, conditional_escape
-from django.utils import six
 
 from generic_plus.forms import BaseGenericFileInlineFormSet, GenericForeignFileWidget
 

cropduster/models.py

@@ -7,14 +7,14 @@
 import time
 from datetime import datetime
 
+import six
+from six.moves import xrange
+
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.core.files.storage import FileSystemStorage
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection, models
-from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.six.moves import xrange
 from django.core.files.storage import default_storage, FileSystemStorage
 
 import PIL.Image
@@ -44,7 +44,7 @@ def safe_str_path(file_path):
     return file_path
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class Thumb(models.Model):
 
     name = models.CharField(max_length=255, db_index=True)
@@ -213,7 +213,7 @@ def generate_filename(instance, filename):
     return filename
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class Image(models.Model):
 
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)

cropduster/resizing.py

@@ -6,12 +6,11 @@
 import hashlib
 import tempfile
 
+import six
+from six.moves import filter
 import PIL.Image
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.six.moves import filter
 from django.core.files.storage import default_storage
 
 from .settings import CROPDUSTER_RETAIN_METADATA
@@ -23,7 +22,7 @@
 INFINITY = float('inf')
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class SizeAlias(object):
     is_alias = True
 
@@ -46,7 +45,7 @@ def add_to_sizes_dict(self, sizes):
         ctx.update(size_to)
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class Size(object):
 
     is_alias = False

cropduster/settings.py

@@ -2,9 +2,9 @@
 import PIL
 import distutils.spawn
 from distutils.version import LooseVersion
+import six
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 
 
 CROPDUSTER_MEDIA_ROOT = getattr(settings, 'CROPDUSTER_MEDIA_ROOT', settings.MEDIA_ROOT)
@@ -45,8 +45,12 @@ def get_jpeg_quality(width, height):
             "CROPDUSTER_JPEG_QUALITY setting must be either a callable "
             "or a numeric value, got type %s" % (type(CROPDUSTER_JPEG_QUALITY).__name__))
 
-JPEG_SAVE_ICC_SUPPORTED = (LooseVersion(getattr(PIL, 'PILLOW_VERSION', '0'))
-    >= LooseVersion('2.2.1'))
+try:
+    PILLOW_VERSION = getattr(PIL, '__version__', '0')
+except AttributeError:
+    PILLOW_VERSION = getattr(PIL, 'PILLOW_VERSION', '0')
+
+JPEG_SAVE_ICC_SUPPORTED = (LooseVersion(PILLOW_VERSION) >= LooseVersion('2.2.1'))
 
 CROPDUSTER_GIFSICLE_PATH = getattr(settings, 'CROPDUSTER_GIFSICLE_PATH', None)