Merge pull request #544 from leukeleu/drop-compat

Fixed #540 -- Drop support for unsupported Python and Django versions

Author: vstoykov

.github/workflows/python.yml

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

docs/_themes/flask_theme_support.py

@@ -1,7 +1,8 @@
 # flasky extensions.  flasky pygments style based on tango style
 from pygments.style import Style
-from pygments.token import Keyword, Name, Comment, String, Error, \
-     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
+from pygments.token import (Comment, Error, Generic, Keyword, Literal, Name,
+                            Number, Operator, Other, Punctuation, String,
+                            Whitespace)
 
 
 class FlaskyStyle(Style):

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # ImageKit documentation build configuration file, created by
 # sphinx-quickstart on Sun Sep 25 17:05:55 2011.
@@ -11,7 +10,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import re, sys, os
+import os
+import re
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -42,8 +43,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'ImageKit'
-copyright = u'2011, Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett & Matthew Tretter'
+project = 'ImageKit'
+copyright = '2011, Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett & Matthew Tretter'
 
 pkgmeta = {}
 execfile(os.path.join(os.path.dirname(__file__), '..', 'imagekit',
@@ -189,8 +190,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'ImageKit.tex', u'ImageKit Documentation',
-   u'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett \\& Matthew Tretter', 'manual'),
+  ('index', 'ImageKit.tex', 'ImageKit Documentation',
+   'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett \\& Matthew Tretter', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -219,8 +220,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'imagekit', u'ImageKit Documentation',
-     [u'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett & Matthew Tretter'], 1)
+    ('index', 'imagekit', 'ImageKit Documentation',
+     ['Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett & Matthew Tretter'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -233,7 +234,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'ImageKit', u'ImageKit Documentation', u'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett & Matthew Tretter',
+  ('index', 'ImageKit', 'ImageKit Documentation', 'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett & Matthew Tretter',
    'ImageKit', 'One line description of project.', 'Miscellaneous'),
 ]
 

imagekit/__init__.py

@@ -1,6 +1,9 @@
-# flake8: noqa
-from . import conf
-from . import generatorlibrary
-from .specs import ImageSpec
+from . import conf, generatorlibrary
 from .pkgmeta import *
 from .registry import register, unregister
+from .specs import ImageSpec
+
+__all__ = [
+    'ImageSpec', 'conf', 'generatorlibrary', 'register', 'unregister',
+    '__title__', '__author__', '__version__', '__license__'
+]

imagekit/admin.py

@@ -1,14 +1,8 @@
-from django import VERSION
-if VERSION[0] < 2:
-    # ugettext is an alias for gettext() since Django 2.0,
-    # and deprecated as of Django 3.0.
-    from django.utils.translation import ugettext_lazy as _
-else:
-    from django.utils.translation import gettext_lazy as _
 from django.template.loader import render_to_string
+from django.utils.translation import gettext_lazy as _
 
 
-class AdminThumbnail(object):
+class AdminThumbnail:
     """
     A convenience utility for adding thumbnails to Django's admin change list.
 

imagekit/cachefiles/__init__.py

@@ -1,13 +1,15 @@
 from copy import copy
+
 from django.conf import settings
 from django.core.files import File
 from django.core.files.images import ImageFile
-from django.utils.functional import SimpleLazyObject
 from django.utils.encoding import smart_str
+from django.utils.functional import SimpleLazyObject
+
 from ..files import BaseIKFile
 from ..registry import generator_registry
 from ..signals import content_required, existence_required
-from ..utils import get_logger, get_singleton, generate, get_by_qname
+from ..utils import generate, get_by_qname, get_logger, get_singleton
 
 
 class ImageCacheFile(BaseIKFile, ImageFile):
@@ -55,7 +57,7 @@ def __init__(self, generator, name=None, storage=None, cachefile_backend=None, c
                              'cache file strategy')
         )
 
-        super(ImageCacheFile, self).__init__(storage=storage)
+        super().__init__(storage=storage)
 
     def _require_file(self):
         if getattr(self, '_file', None) is None:
@@ -162,10 +164,6 @@ def __setstate__(self, state):
             )
         self.__dict__.update(state)
 
-    def __nonzero__(self):
-        # Python 2 compatibility
-        return self.__bool__()
-
     def __repr__(self):
         return smart_str("<%s: %s>" % (
             self.__class__.__name__, self if self.name else "None")
@@ -177,7 +175,7 @@ def __init__(self, generator_id, *args, **kwargs):
         def setup():
             generator = generator_registry.get(generator_id, *args, **kwargs)
             return ImageCacheFile(generator)
-        super(LazyImageCacheFile, self).__init__(setup)
+        super().__init__(setup)
 
     def __repr__(self):
         return '<%s: %s>' % (self.__class__.__name__, str(self) or 'None')

imagekit/cachefiles/backends.py

@@ -1,11 +1,13 @@
-from ..utils import get_singleton, get_cache, sanitize_cache_key
 import warnings
 from copy import copy
-from django.core.exceptions import ImproperlyConfigured
+
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+
+from ..utils import get_cache, get_singleton, sanitize_cache_key
 
 
-class CacheFileState(object):
+class CacheFileState:
     EXISTS = 'exists'
     GENERATING = 'generating'
     DOES_NOT_EXIST = 'does_not_exist'
@@ -25,7 +27,7 @@ class InvalidFileBackendError(ImproperlyConfigured):
     pass
 
 
-class AbstractCacheFileBackend(object):
+class AbstractCacheFileBackend:
     """
     An abstract cache file backend. This isn't used by any internal classes and
     is included simply to illustrate the minimum interface of a cache file
@@ -39,7 +41,7 @@ def exists(self, file):
         raise NotImplementedError
 
 
-class CachedFileBackend(object):
+class CachedFileBackend:
     existence_check_timeout = 5
     """
     The number of seconds to wait before rechecking to see if the file exists.
@@ -157,7 +159,7 @@ def __init__(self, *args, **kwargs):
         except ImportError:
             raise ImproperlyConfigured('You must install celery to use'
                                        ' imagekit.cachefiles.backends.Celery.')
-        super(Celery, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def schedule_generation(self, file, force=False):
         _celery_task.delay(self, file, force=force)
@@ -168,7 +170,7 @@ class Async(Celery):
     def __init__(self, *args, **kwargs):
         message = '{path}.Async is deprecated. Use {path}.Celery instead.'
         warnings.warn(message.format(path=__name__), DeprecationWarning)
-        super(Async, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 try:
@@ -189,7 +191,7 @@ def __init__(self, *args, **kwargs):
         except ImportError:
             raise ImproperlyConfigured('You must install django-rq to use'
                                        ' imagekit.cachefiles.backends.RQ.')
-        super(RQ, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def schedule_generation(self, file, force=False):
         _rq_job.delay(self, file, force=force)
@@ -213,7 +215,7 @@ def __init__(self, *args, **kwargs):
         except ImportError:
             raise ImproperlyConfigured('You must install django-dramatiq to use'
                                         ' imagekit.cachefiles.backends.Dramatiq.')
-        super(Dramatiq, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def schedule_generation(self, file, force=False):
         _dramatiq_actor.send(self, file, force=force)

imagekit/cachefiles/namers.py

@@ -5,8 +5,10 @@
 
 """
 
-from django.conf import settings
 import os
+
+from django.conf import settings
+
 from ..utils import format_to_extension, suggest_extension
 
 

imagekit/cachefiles/strategies.py

@@ -1,11 +1,7 @@
-import six
-
-from django.utils.functional import LazyObject
-from ..lib import force_text
 from ..utils import get_singleton
 
 
-class JustInTime(object):
+class JustInTime:
     """
     A strategy that ensures the file exists right before it's needed.
 
@@ -18,7 +14,7 @@ def on_content_required(self, file):
         file.generate()
 
 
-class Optimistic(object):
+class Optimistic:
     """
     A strategy that acts immediately when the source file changes and assumes
     that the cache files will not be removed (i.e. it doesn't ensure the
@@ -33,14 +29,14 @@ def should_verify_existence(self, file):
         return False
 
 
-class DictStrategy(object):
+class DictStrategy:
     def __init__(self, callbacks):
         for k, v in callbacks.items():
             setattr(self, k, v)
 
 
 def load_strategy(strategy):
-    if isinstance(strategy, six.string_types):
+    if isinstance(strategy, str):
         strategy = get_singleton(strategy, 'cache file strategy')
     elif isinstance(strategy, dict):
         strategy = DictStrategy(strategy)