Support Django 2.2, 3.2 and 4.0 with Python 3.7-3.9 (#49)

Author: Mojken

README.rst

@@ -25,7 +25,7 @@ Install django-viewlet in your python environment
 
     $ pip install django-viewlet
 
-Supports ``Django`` versions 1.3 - 2.0 and ``Python`` version 3.6.
+Supports ``Django`` versions 2.2, 3.2, 4.0 and ``Python`` versions 3.7 - 3.9.
 
 
 Configuration
@@ -43,36 +43,6 @@ Add ``viewlet`` to your ``INSTALLED_APPS`` setting so Django can find the templa
 Jinja2
 ______
 
-
-If you're using ``Coffin`` or ``Jingo``, add the ``ViewletExtension`` to their settings,
-and optionally switch to their respective environment.
-
-**Coffin:**
-
-.. code-block:: python
-
-    JINJA2_EXTENSIONS = (
-        ...,
-        "viewlet.loaders.jinja2_loader.ViewletExtension",
-    )
-
-    VIEWLET_JINJA2_ENVIRONMENT = "coffin.common.env"
-
-**Jingo:**
-
-.. code-block:: python
-
-    JINJA_CONFIG = {
-        "extensions": (
-            ...,
-            "viewlet.loaders.jinja2_loader.ViewletExtension",
-        ),
-    }
-
-    VIEWLET_JINJA2_ENVIRONMENT = "jingo.get_env"
-
-**Django 1.8+:**
-
 Add ``ViewletExtension`` to the list of extensions of Jinja2 template engine
 
 .. code-block:: python

run_tests.py

@@ -42,7 +42,6 @@ def main():
         "TEMPLATE_CONTEXT_PROCESSORS": [
             "django.core.context_processors.request",
         ],
-        "TEMPLATE_DIRS": (os.path.join(ROOT, "template_dir"),),
         "TEMPLATES": [
             {
                 "BACKEND": "django.template.backends.django.DjangoTemplates",
@@ -78,47 +77,32 @@ def main():
         "JINJA_CONFIG": {"autoescape": True},  # Jingo config
     }
 
-    if django.VERSION >= (1, 10):
-        conf["MIDDLEWARE"] = conf.pop("MIDDLEWARE_CLASSES")
-
-    if django.VERSION < (1, 8):
-        conf.pop("TEMPLATES")
-    else:
-        conf.pop("TEMPLATE_DEBUG")
-        conf.pop("TEMPLATE_CONTEXT_PROCESSORS")
-        conf.pop("TEMPLATE_DIRS")
-
-    if django.VERSION >= (1, 2):
-        conf.update(
-            DATABASES={
-                "default": {
-                    "ENGINE": "django.db.backends.sqlite3",
-                    "NAME": ":memory:",
-                }
-            }
-        )
+    conf["MIDDLEWARE"] = conf.pop("MIDDLEWARE_CLASSES")
+
+    conf.pop("TEMPLATE_DEBUG")
+    conf.pop("TEMPLATE_CONTEXT_PROCESSORS")
 
-        conf.update(
-            CACHES={
-                "default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}
+    conf.update(
+        DATABASES={
+            "default": {
+                "ENGINE": "django.db.backends.sqlite3",
+                "NAME": ":memory:",
             }
-        )
-    else:
-        conf.update(DATABASE_ENGINE="sqlite3")
-        conf.update(CACHE_BACKEND="locmem://")
+        }
+    )
+
+    conf.update(
+        CACHES={"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
+    )
 
     settings.configure(**conf)
 
-    if django.VERSION >= (1, 7):
-        django.setup()
+    django.setup()
 
     from django.test.utils import get_runner
 
-    if django.VERSION < (1, 2):
-        failures = get_runner(settings)(["viewlet"], verbosity=2, interactive=True)
-    else:
-        test_runner = get_runner(settings)(verbosity=2, interactive=True)
-        failures = test_runner.run_tests(["viewlet"])
+    test_runner = get_runner(settings)(verbosity=2, interactive=True)
+    failures = test_runner.run_tests(["viewlet"])
 
     sys.exit(failures)
 

setup.py

@@ -59,14 +59,9 @@ def finalize_options(self):
     license="MIT",
     classifiers=[
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Framework :: Django",
         "Natural Language :: English",
         "Environment :: Web Environment",
@@ -84,7 +79,7 @@ def finalize_options(self):
     install_requires=[
         "six",
     ],
-    tests_require=["coverage", "Jinja2", "jingo", "coffin<2"],
+    tests_require=["coverage", "Jinja2"],
     test_suite="run_tests.main",
     cmdclass=cmdclasses,
 )

tox.ini

@@ -2,48 +2,33 @@
 # https://github.com/tox-dev/tox/pull/670
 
 [tox]
-envlist = py26-django{ 13, 14, 15, 16                           },
-          py27-django{     14, 15, 16, 17, 18, 19, 110, 111     },
-          py33-django{         15, 16, 17, 18                   },
-          py34-django{                 17, 18, 19, 110, 111, 20 },
-          py35-django{                     18, 19, 110, 111, 20 },
-          py36-django{                                  111, 20 }
+envlist =
+          py37-django{ 22, 32     }
+          py38-django{     32     }
+          py39-django{     32, 40 }
 
 
 [testenv]
 passenv = COVERAGE_FILE
 whitelist_externals = make
-commands =
-    make test
-install_command =
-    pip install --no-binary --pre {opts} {packages}
-deps = django12: Django>=1.2,<1.3
-       django13: Django>=1.3,<1.4
-       django14: Django>=1.4,<1.5
-       django15: Django>=1.5,<1.6
-       django16: Django>=1.6,<1.7
-       django17: Django>=1.7,<1.8
-       django18: Django>=1.8,<1.9
-       django19: Django>=1.9,<1.10
-       django110: Django>=1.10,<1.11
-       django111: Django>=1.11,<1.12
-       django20: Django>=2.0b1,<2.1
-       coverage
+commands = make test
+install_command = pip install --pre {opts} {packages}
+deps =
+     django22: Django>=2.2,<2.3
+     django32: Django>=3.2,<3.3
+     django40: Django>=4.0,<4.1
+     coverage
 
 [testenv:coverage]
 skip_install = true
 passenv = COVERAGE_FILE
-basepython = python3.4
-commands =
-    make coverage
-deps =
-    coverage
+basepython = python3.9
+commands = make coverage
+deps = coverage
 
 
 [testenv:lint]
-basepython = python3.4
+basepython = python3.9
 skip_install = true
-commands =
-    make lint
-deps =
-    flake8
+commands = make lint
+deps = flake8

viewlet/cache.py

@@ -1,28 +1,25 @@
 import hashlib
 
-from .compat import smart_text
+from django.utils.encoding import smart_str
+
 from .conf import settings
 from .exceptions import DeprecatedKeyFormat, WrongKeyFormat
 
 
 def get_cache(alias=None):
-    import django
     from django.core import cache
 
     try:
         key = alias or settings.VIEWLET_DEFAULT_CACHE_ALIAS
-        if django.VERSION >= (1, 7):
-            c = cache.caches[key]
-        else:
-            c = cache.get_cache(key)
+        c = cache.caches[key]
     except (cache.InvalidCacheBackendError, ValueError):
         c = cache.cache
 
     return c
 
 
 def join_args(args):
-    return ":".join(map(smart_text, args))
+    return ":".join(map(smart_str, args))
 
 
 def digest_args(args):

viewlet/compat.py

@@ -18,7 +18,6 @@ def __init__(self, **conf):
         "VIEWLET_DEFAULT_CACHE_ALIAS": "viewlet",
         "VIEWLET_CACHE_KEY_FUNCTION": "viewlet.cache.make_key_args_digest",
         "VIEWLET_CACHE_KEY_MAX_LENGTH": 255,
-        "VIEWLET_TEMPLATE_ENGINE": "django",
         "VIEWLET_INFINITE_CACHE_TIMEOUT": 31104000,  # 60*60*24*30*12, about a year
         "VIEWLET_JINJA2_ENVIRONMENT": "viewlet.loaders.jinja2_loader.create_env",
     }

viewlet/conf.py

@@ -28,9 +28,9 @@ def autodiscover(self):
         Autodiscover decorated viewlets.
         Imports all views.py and viewlets.py to trigger the decorators.
         """
-        from django.conf import settings
+        from importlib import import_module
 
-        from .compat import import_module
+        from django.conf import settings
 
         for app in settings.INSTALLED_APPS:
             try:

viewlet/library.py

@@ -1,37 +0,0 @@
-import warnings
-
-import django
-
-from viewlet.conf import settings
-
-
-def get_loader():
-    if settings.VIEWLET_TEMPLATE_ENGINE.lower() == "jinja2":
-        if django.VERSION < (1, 8):
-            from . import jinja2_loader as loader
-
-            return loader
-        warnings.warn(
-            "VIEWLET_TEMPLATE_ENGINE setting is deprecated for Django 1.8+",
-            DeprecationWarning,
-        )
-    from . import django_loader as loader
-
-    return loader
-
-
-def render(*args, **kwargs):
-    loader = get_loader()
-    return loader.render_to_string(*args, **kwargs)
-
-
-def mark_safe(value):
-    loader = get_loader()
-    return loader.mark_safe(value)
-
-
-def querydict_to_kwargs(querydict):
-    def make_key(k):
-        return k
-
-    return {make_key(k): ",".join(querydict.getlist(k)) for k in querydict}

viewlet/loaders/__init__.py

@@ -1,3 +1,5 @@
+from importlib import import_module
+
 from django.conf import settings as django_settings
 from jinja2 import ChoiceLoader, FileSystemLoader, PackageLoader, nodes
 from jinja2.environment import Environment
@@ -6,7 +8,6 @@
 
 import viewlet
 
-from ..compat import import_module
 from ..conf import settings