From 4dba8df21d2d4203f9fe56b1e118047ef9dcd2db Mon Sep 17 00:00:00 2001
From: Karl Leuschen <karl@leuschen.com>
Date: Sun, 4 Sep 2022 11:31:03 -0300
Subject: [PATCH 1/3] Support latest Pythons and Djangos

Unsupported versions of Python and Django have been dropped
---
 .travis.yml                                  | 12 +++---
 jstemplate/finders.py                        | 12 ++----
 jstemplate/loading.py                        |  6 +--
 jstemplate/preprocessors.py                  | 13 +++---
 jstemplate/templatetags/base.py              | 14 ++----
 jstemplate/templatetags/handlebarsjs.py      |  4 +-
 jstemplate/tests/project/project/settings.py |  2 +
 jstemplate/tests/project/project/urls.py     | 18 +-------
 jstemplate/tests/project/project/views.py    |  2 +-
 jstemplate/tests/test_finders.py             | 16 +++----
 jstemplate/tests/test_loading.py             |  5 +--
 jstemplate/tests/test_makemessages.py        |  7 +--
 jstemplate/tests/test_translation.py         | 23 +++-------
 jstemplate/tests/test_ttag.py                |  9 +---
 jstemplate/tests/utils.py                    | 45 --------------------
 requirements.txt                             |  6 +--
 setup.py                                     | 14 +++---
 tox.ini                                      | 11 +++--
 18 files changed, 55 insertions(+), 164 deletions(-)
 delete mode 100644 jstemplate/tests/utils.py

diff --git a/.travis.yml b/.travis.yml
index 05cf82c..a9ea734 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,14 @@
 language: python
 python:
-  - "2.7"
-  - "3.4"
+  - "3.7"
+  - "3.8"
+  - "3.9"
+  - "3.10"
 
 env:
-  - DJANGO="django<1.7"  # 1.6.x
-  - DJANGO="django<1.8"  # 1.7.x
-  - DJANGO="django<1.9"  # 1.8.x
+  - DJANGO="django<3"  # 2.2.x
+  - DJANGO="django<4"  # 3.2.x
+  - DJANGO="django<4.1"  # 4.0.x
   - DJANGO="git+git://github.com/django/django.git@master#egg=django"
 
 # command to install dependencies
diff --git a/jstemplate/finders.py b/jstemplate/finders.py
index a4db0f0..66fbf51 100644
--- a/jstemplate/finders.py
+++ b/jstemplate/finders.py
@@ -1,15 +1,13 @@
-from __future__ import unicode_literals
-
+import glob
+import os
+import re
+import sys
 import warnings
-import glob, os, sys, re
-import six
-
 from importlib import import_module
 
 from .conf import conf
 
 
-
 class BaseFinder(object):
     def find(self, name):
         raise NotImplementedError()
@@ -115,8 +113,6 @@ def _get_app_template_dirs():
         for dirname in conf.JSTEMPLATE_APP_DIRNAMES:
             template_dir = os.path.join(app_dir, dirname)
             if os.path.isdir(template_dir):
-                if not six.PY3:
-                    template_dir = template_dir.decode(fs_encoding)
                 ret.append(template_dir)
     return ret
 
diff --git a/jstemplate/loading.py b/jstemplate/loading.py
index 54306ac..df4f7a3 100644
--- a/jstemplate/loading.py
+++ b/jstemplate/loading.py
@@ -1,13 +1,9 @@
-from __future__ import unicode_literals
-
-import six
 from django.core.exceptions import ImproperlyConfigured
 from importlib import import_module
 
 from .conf import conf
 
 
-
 def find(name):
     all_matches = {}
 
@@ -16,7 +12,7 @@ def find(name):
 
         # <finder>.find may return a single string.  The name of the template
         # will then be the name given to 'find'
-        if isinstance(matches, six.text_type):
+        if isinstance(matches, str):
             filepath = matches
             if name not in all_matches:
                 all_matches[name] = filepath
diff --git a/jstemplate/preprocessors.py b/jstemplate/preprocessors.py
index 5463339..50d7bac 100644
--- a/jstemplate/preprocessors.py
+++ b/jstemplate/preprocessors.py
@@ -1,9 +1,8 @@
-from __future__ import unicode_literals
-
 import re
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 from .conf import conf
 
+
 class I18nPreprocessor(object):
     @property
     def tagnames(self):
@@ -13,7 +12,7 @@ def tagnames(self):
     def short_trans_re(self):
         # Should match strings like: {{ _ "Hello, world! }}
         tagnames = '|'.join(['(?:{0})'.format(t) for t in self.tagnames])
-        
+
         left_side = r'''(?P<left>\{\{\s*(?P<tag>(?:''' + tagnames + r''')\s+)(?P<quote>['"]))'''
         right_side = r'''(?P<right>(?P=quote)\s*\}\})'''
 
@@ -23,7 +22,7 @@ def short_trans_re(self):
     def long_trans_re(self):
         # Should match strings like: {{# _ }}Hello, {{ name }}.{{/ _ }}
         tagnames = '|'.join(['(?:{0})'.format(t) for t in self.tagnames])
-        
+
         start_tag = r'\{\{#\s*(?P<tag>' + tagnames + r')\s*\}\}'
         end_tag = r'\{\{\/\s*(?P=tag)\s*\}\}'
 
@@ -33,14 +32,14 @@ def translate_short_form(self, match):
         """Translate a result of matching the compiled trans_re pattern."""
         tag = match.group('tag')
         msg = match.group('msg')
-        msg = ugettext(msg) if len(msg) > 0 else ''
+        msg = gettext(msg) if len(msg) > 0 else ''
         string = match.group('left').replace(tag, '', 1) + msg + match.group('right')
         return string
 
     def translate_long_form(self, match):
         """Translate a result of matching the compiled trans_re pattern."""
         msg = match.group('msg')
-        string = ugettext(msg) if len(msg) > 0 else ''
+        string = gettext(msg) if len(msg) > 0 else ''
         return string
 
     def process(self, content):
diff --git a/jstemplate/templatetags/base.py b/jstemplate/templatetags/base.py
index ad384e3..44a870c 100644
--- a/jstemplate/templatetags/base.py
+++ b/jstemplate/templatetags/base.py
@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-import six
 from django import template
 from ..conf import conf
 from ..loading import find, preprocess, JSTemplateNotFound
@@ -45,13 +42,8 @@ def render_file(self, context, resolved_name, filepath):
         return output
 
     def read_template_file_contents(self, filepath):
-        if six.PY3:
-            with open(filepath, "r", encoding=conf.FILE_CHARSET) as fp:
-                template_text = fp.read()
-        else:
-            with open(filepath, "r") as fp:
-                template_text = fp.read().decode(conf.FILE_CHARSET)
-
+        with open(filepath, "r") as fp:
+            template_text = fp.read()
         template_text = self.preprocess(template_text)
         return template_text
 
@@ -71,4 +63,4 @@ def jstemplate_tag_helper(tagname, TagNodeClass, parser, token):
             "'%s' tag takes at least one argument: the name/id of "
             "the template, or a pattern matching a set of templates. "
             % tagname)
-    return TagNodeClass(*bits[1:])
\ No newline at end of file
+    return TagNodeClass(*bits[1:])
diff --git a/jstemplate/templatetags/handlebarsjs.py b/jstemplate/templatetags/handlebarsjs.py
index 6e4a6d4..b942a69 100644
--- a/jstemplate/templatetags/handlebarsjs.py
+++ b/jstemplate/templatetags/handlebarsjs.py
@@ -1,6 +1,4 @@
-from __future__ import unicode_literals
 from django import template
-from ..conf import conf
 from .base import BaseJSTemplateNode, jstemplate_tag_helper
 
 
@@ -49,7 +47,7 @@ def handlebarsjs(parser, token):
     Finds the Handlebars template for the given name and renders it surrounded
     by the requisite Handlebars <script> tags.
 
-    We don't use the jstemplate_tag_helper here, since we can take an 
+    We don't use the jstemplate_tag_helper here, since we can take an
     additional parameter denoting whether to register partials inline.
 
     """
diff --git a/jstemplate/tests/project/project/settings.py b/jstemplate/tests/project/project/settings.py
index 20a4f0f..1a495fc 100644
--- a/jstemplate/tests/project/project/settings.py
+++ b/jstemplate/tests/project/project/settings.py
@@ -1,6 +1,8 @@
 import sys
 import os
 
+FILE_CHARSET = "utf8"
+
 DIR = os.path.dirname(os.path.abspath(__file__))
 BASE_DIR = os.path.join(DIR, '..', '..', '..', '..')
 sys.path.insert(0, os.path.abspath(BASE_DIR))
diff --git a/jstemplate/tests/project/project/urls.py b/jstemplate/tests/project/project/urls.py
index 6ecfd7f..637600f 100644
--- a/jstemplate/tests/project/project/urls.py
+++ b/jstemplate/tests/project/project/urls.py
@@ -1,17 +1 @@
-from django.conf.urls import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'project.views.home', name='home'),
-    # url(r'^project/', include('project.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
-)
+urlpatterns = []
diff --git a/jstemplate/tests/project/project/views.py b/jstemplate/tests/project/project/views.py
index 7031d77..de5cdaf 100644
--- a/jstemplate/tests/project/project/views.py
+++ b/jstemplate/tests/project/project/views.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 def f():
     return _('View message')
diff --git a/jstemplate/tests/test_finders.py b/jstemplate/tests/test_finders.py
index 399f1dc..1035e67 100644
--- a/jstemplate/tests/test_finders.py
+++ b/jstemplate/tests/test_finders.py
@@ -1,11 +1,8 @@
 import os
 
-from django.core.exceptions import ImproperlyConfigured
-from django.test import TestCase
+from django.test import override_settings, TestCase
 
-from mock import patch
-
-from .utils import override_settings
+from unittest.mock import patch
 
 
 
@@ -181,8 +178,9 @@ def test_get_app_template_dirs(self):
         self.assertEqual(self.func(), [os.path.join(here, "templates")])
 
 
-    @override_settings(INSTALLED_APPS=["jstemplate.nonexistent"])
     def test_bad_app(self):
-        with patch('warnings.warn') as warn:
-            self.func()
-            self.assertEqual(warn.call_count, 1)
+        with self.assertRaises(ModuleNotFoundError):
+            # Adding the non-existent app to INSTALLED_APPS triggers a
+            # ModuleNotFoundError
+            with override_settings(INSTALLED_APPS=["jstemplate.nonexistent"]):
+                pass
diff --git a/jstemplate/tests/test_loading.py b/jstemplate/tests/test_loading.py
index 3568b3e..2c581f8 100644
--- a/jstemplate/tests/test_loading.py
+++ b/jstemplate/tests/test_loading.py
@@ -1,10 +1,9 @@
 from django.core.exceptions import ImproperlyConfigured
-from django.test import TestCase
+from django.test import override_settings, TestCase
 
-from mock import patch
+from unittest.mock import patch
 
 from .mockfinders import MockFinder
-from .utils import override_settings
 
 
 
diff --git a/jstemplate/tests/test_makemessages.py b/jstemplate/tests/test_makemessages.py
index e790ac6..26bfaaf 100644
--- a/jstemplate/tests/test_makemessages.py
+++ b/jstemplate/tests/test_makemessages.py
@@ -1,14 +1,9 @@
-import mock
 import os.path
 
-from django.template import Template, Context, TemplateSyntaxError
-from django.test import TestCase
-from mock import patch
+from django.test import override_settings, TestCase
 
 from jstemplate.management.commands import makemessages
 
-from .utils import override_settings
-
 DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "project", "project", "jstemplates")
 
 class MonkeyPatchedTemplatizeTest (TestCase):
diff --git a/jstemplate/tests/test_translation.py b/jstemplate/tests/test_translation.py
index e4d2387..3aad689 100644
--- a/jstemplate/tests/test_translation.py
+++ b/jstemplate/tests/test_translation.py
@@ -1,15 +1,9 @@
-from __future__ import unicode_literals
-
 import os.path
-import six
 
-from django.test import TestCase
+from django.test import override_settings, TestCase
 from django.utils import translation
 from jstemplate.preprocessors import I18nPreprocessor
 
-from .utils import override_settings
-
-
 
 __all__ = [
     "I18nTest",
@@ -34,13 +28,9 @@ def new_func(*args, **kwargs):
         translation.activate("fr")
         fake_translation = translation.trans_real._active.value
 
-        # wrap the ugettext and ungettext functions so that 'XXX ' will prefix each translation
-        if six.PY3:
-            self.original_gettext = fake_translation.gettext
-            fake_translation.gettext = wrap_with_xxx(fake_translation.gettext)
-        else:
-            self.original_ugettext = fake_translation.ugettext
-            fake_translation.ugettext = wrap_with_xxx(fake_translation.ugettext)
+        # wrap the gettext and ungettext functions so that 'XXX ' will prefix each translation
+        self.original_gettext = fake_translation.gettext
+        fake_translation.gettext = wrap_with_xxx(fake_translation.gettext)
 
         # Turn back on our old translations
         translation.activate(self.native_lang)
@@ -49,10 +39,7 @@ def tearDown(self):
         # Restore the french translation function
         translation.activate("fr")
         fake_translation = translation.trans_real._active.value
-        if six.PY3:
-            fake_translation.gettext = self.original_gettext
-        else:
-            fake_translation.ugettext = self.original_ugettext
+        fake_translation.gettext = self.original_gettext
 
         # Turn back on our old translations
         translation.activate(self.native_lang)
diff --git a/jstemplate/tests/test_ttag.py b/jstemplate/tests/test_ttag.py
index a563974..b3e709a 100644
--- a/jstemplate/tests/test_ttag.py
+++ b/jstemplate/tests/test_ttag.py
@@ -1,16 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-import mock
 import os.path
 
 from django.template import Template, Context, TemplateSyntaxError
-from django.test import TestCase
-from mock import patch
-import six
-
-from .utils import override_settings
-
+from django.test import override_settings, TestCase
 
 
 __all__ = [
diff --git a/jstemplate/tests/utils.py b/jstemplate/tests/utils.py
deleted file mode 100644
index 9074f09..0000000
--- a/jstemplate/tests/utils.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-Testing utilities backported from recent Django versions, for testing with
-older Django versions.
-
-"""
-from __future__ import with_statement
-
-from django.conf import settings, UserSettingsHolder
-from django.utils.functional import wraps
-
-
-
-class override_settings(object):
-    """
-    Acts as either a decorator, or a context manager. If it's a decorator it
-    takes a function and returns a wrapped function. If it's a contextmanager
-    it's used with the ``with`` statement. In either event entering/exiting
-    are called before and after, respectively, the function/block is executed.
-
-    """
-    def __init__(self, **kwargs):
-        self.options = kwargs
-        self.wrapped = settings._wrapped
-
-    def __enter__(self):
-        self.enable()
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.disable()
-
-    def __call__(self, func):
-        @wraps(func)
-        def inner(*args, **kwargs):
-            with self:
-                return func(*args, **kwargs)
-        return inner
-
-    def enable(self):
-        override = UserSettingsHolder(settings._wrapped)
-        for key, new_value in self.options.items():
-            setattr(override, key, new_value)
-        settings._wrapped = override
-
-    def disable(self):
-        settings._wrapped = self.wrapped
diff --git a/requirements.txt b/requirements.txt
index bfd2baf..e9dc548 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,2 @@
-django>=1.5
-six
-mock
-coverage
\ No newline at end of file
+django>=2.2
+coverage
diff --git a/setup.py b/setup.py
index 1c4a9a3..29bf493 100644
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,7 @@ def get_version():
     packages=find_packages(),
     package_data={'jstemplate': ['static/libs/*.js']},
     install_requires=[
-        'Django >= 1.3',
-        'six'
+        'Django >= 2.2',
     ],
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -38,15 +37,14 @@ def get_version():
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "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.2",
-        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Framework :: Django",
     ],
     zip_safe=False,
-    tests_require=["Django>=1.3", "mock", "six"],
+    tests_require=["Django>=2.2", "coverage"],
     test_suite="runtests.runtests"
 )
diff --git a/tox.ini b/tox.ini
index a52347a..bd41c74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
-envlist=py{27,34}-dj{17,18,19}
+envlist=py{37,38,39,310}-dj{22,32,40,41}
 
 [testenv]
 commands=python jstemplate/tests/project/manage.py test
 deps =
-    mock
-    six
-    django17: Django>=1.7,<1.8
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
+    django22: Django>=2.2,<3
+    django32: Django>=3.2,<4
+    django40: Django>=4.0,<4.1
+    django41: Django>=4.1,<4.2

From 61374d536a54104c6811018834c997534406fd50 Mon Sep 17 00:00:00 2001
From: Karl Leuschen <karl@leuschen.com>
Date: Sun, 4 Sep 2022 11:42:37 -0300
Subject: [PATCH 2/3] Bump version

---
 CHANGES.rst            | 7 +++++++
 jstemplate/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 824d3a1..d05abcc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+1.4.0
+-----
+
+- Support Python 3.7-3.10
+- Support Django 2.2-4.1
+- Drop support for Python<3.7 and Django<3.2
+
 1.3.8
 -----
 
diff --git a/jstemplate/__init__.py b/jstemplate/__init__.py
index ffa9fec..3e8d9f9 100644
--- a/jstemplate/__init__.py
+++ b/jstemplate/__init__.py
@@ -1 +1 @@
-__version__ = "1.3.8"
+__version__ = "1.4.0"

From 441127236d7b28bebc9248f7f28d70e4098af495 Mon Sep 17 00:00:00 2001
From: Karl Leuschen <karl@leuschen.com>
Date: Sun, 4 Sep 2022 12:19:37 -0300
Subject: [PATCH 3/3] Drop unused FILE_CHARSET setting

---
 jstemplate/tests/project/project/settings.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jstemplate/tests/project/project/settings.py b/jstemplate/tests/project/project/settings.py
index 1a495fc..20a4f0f 100644
--- a/jstemplate/tests/project/project/settings.py
+++ b/jstemplate/tests/project/project/settings.py
@@ -1,8 +1,6 @@
 import sys
 import os
 
-FILE_CHARSET = "utf8"
-
 DIR = os.path.dirname(os.path.abspath(__file__))
 BASE_DIR = os.path.join(DIR, '..', '..', '..', '..')
 sys.path.insert(0, os.path.abspath(BASE_DIR))