Merge PR #534 from jaap3:patch-1

force_text and smart_text were deprecated in Django 3.0 and are removed in Django 4.0

Author: vstoykov

.github/workflows/python.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2

imagekit/lib.py

@@ -1,4 +1,5 @@
 # flake8: noqa
+import sys
 
 # Required PIL classes may or may not be available from the root namespace
 # depending on the installation method used.
@@ -39,13 +40,18 @@ def emit(self, record):
 # This function will replace `unicode` used in the code
 # If Django version is under 1.5 then use `force_unicde`
 # It is used for compatibility between Python 2 and Python 3
-try:
-    from django.utils.encoding import force_text, force_bytes, smart_text
-except ImportError:
-    # Django < 1.5
-    from django.utils.encoding import (force_unicode as force_text,
-                                       smart_str as force_bytes,
-                                       smart_unicode as smart_text)
+if sys.version_info >= (3, 0):
+    from django.utils.encoding import (force_bytes,
+                                      force_str as force_text,
+                                      smart_str as smart_text)
+else:
+    try:
+        from django.utils.encoding import force_text, force_bytes, smart_text
+    except ImportError:
+        # Django < 1.5
+        from django.utils.encoding import (force_unicode as force_text,
+                                        smart_str as force_bytes,
+                                        smart_unicode as smart_text)
 
 __all__ = ['Image', 'ImageColor', 'ImageChops', 'ImageEnhance', 'ImageFile',
            'ImageFilter', 'ImageDraw', 'ImageStat', 'StringIO', 'NullHandler',

setup.py

@@ -45,7 +45,8 @@ def exec_file(filepath, globalz=None, localz=None):
     zip_safe=False,
     include_package_data=True,
     install_requires=[
-        'django-appconf>=0.5',
+        "django-appconf>=0.5,<1.0.4; python_version<'3'",
+        "django-appconf; python_version>'3'",
         'pilkit>=0.2.0',
         'six',
     ],

test-requirements.txt

@@ -1,4 +1,5 @@
 # Test requirements
+mock; python_version<'3'
 beautifulsoup4
 Pillow
 pytest

tests/test_cachefiles.py

@@ -1,6 +1,10 @@
 import pytest
 
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 from django.conf import settings
 from hashlib import md5
 from imagekit.cachefiles import ImageCacheFile, LazyImageCacheFile

tests/test_no_extra_queries.py

@@ -1,4 +1,8 @@
-from unittest.mock import Mock, PropertyMock, patch
+try:
+    from unittest.mock import Mock, PropertyMock, patch
+except:
+    from mock import Mock, PropertyMock, patch
+
 from .models import Photo
 
 

tests/test_optimistic_strategy.py

@@ -1,5 +1,10 @@
 from imagekit.cachefiles import ImageCacheFile
-from unittest.mock import Mock
+
+try:
+    from unittest.mock import Mock
+except:
+    from mock import Mock
+
 from .utils import create_image
 from django.core.files.storage import FileSystemStorage
 from imagekit.cachefiles.backends import Simple as SimpleCFBackend

tox.ini

@@ -1,11 +1,13 @@
 [tox]
 envlist =
+    py27-django{111,18}
     py{36,37,38,39,310}-django{22,31,32},
     py310-djangomain,
     coverage-report
 
 [gh-actions]
 python =
+    2.7: py27
     3.6: py36
     3.7: py37
     3.8: py38
@@ -15,6 +17,8 @@ python =
 [testenv]
 deps =
     -r test-requirements.txt
+    django18: django~=1.8.0
+    django111: django~=1.11.0
     django22: django~=2.2.0
     django31: django~=3.1.0
     django32: django~=3.2.0