From 603bab1ff45f2bdee3815672556ea7cf39a0fc67 Mon Sep 17 00:00:00 2001
From: Christian Wiegand <christianwgd@users.noreply.github.com>
Date: Fri, 10 Dec 2021 07:50:50 +0100
Subject: [PATCH 1/4] Replace django.utils.http.urlquote with
 urllib.parse.quote for django 4.0 compatibility (see
 https://docs.djangoproject.com/en/4.0/releases/3.0/#deprecated-features-3-0)

---
 django_activeurl/utils.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/django_activeurl/utils.py b/django_activeurl/utils.py
index 901462b..8821dd5 100644
--- a/django_activeurl/utils.py
+++ b/django_activeurl/utils.py
@@ -3,9 +3,9 @@
 from __future__ import absolute_import, unicode_literals
 
 from hashlib import md5
+from urllib.parse import quote
 
 from django.core.cache import cache
-from django.utils.http import urlquote
 from django.utils.translation import get_language
 from lxml.etree import ParserError
 from lxml.html import fragment_fromstring, tostring
@@ -155,9 +155,9 @@ def check_active(url, element, **kwargs):
                     kwargs['full_path'].startswith(href)
                     or
                     # maybe an urlquoted href was supplied
-                    urlquote(kwargs['full_path']).startswith(href)
+                    quote(kwargs['full_path']).startswith(href)
                     or
-                    kwargs['full_path'].startswith(urlquote(href))
+                    kwargs['full_path'].startswith(quote(href))
                 )
             else:
                 logic = False
@@ -167,9 +167,9 @@ def check_active(url, element, **kwargs):
                 kwargs['full_path'] == href
                 or
                 # maybe an urlquoted href was supplied
-                urlquote(kwargs['full_path']) == href
+                quote(kwargs['full_path']) == href
                 or
-                kwargs['full_path'] == urlquote(href)
+                kwargs['full_path'] == quote(href)
             )
         # "active" url found
         if logic:

From ee6888f2a4784e04c744efe8f80dd92ac4ec7ecf Mon Sep 17 00:00:00 2001
From: Christian Wiegand <christianwgd@users.noreply.github.com>
Date: Thu, 22 Sep 2022 23:05:39 +0200
Subject: [PATCH 2/4] Drop django < 3.2 support

---
 .coveragerc                                |  2 --
 django_activeurl/conf.py                   |  4 +--
 django_activeurl/models.py                 |  3 +--
 django_activeurl/templatetags/activeurl.py | 17 ++++--------
 django_activeurl/utils.py                  | 31 +++++++++-------------
 pytest.ini                                 |  2 +-
 tests/urls.py                              | 20 +++++++-------
 tox.ini                                    | 26 +++---------------
 8 files changed, 34 insertions(+), 71 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 8b6ea44..cd60182 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,3 @@
 [run]
-include =
-    django_activeurl/*
 omit =
 
diff --git a/django_activeurl/conf.py b/django_activeurl/conf.py
index f176e14..638ec35 100644
--- a/django_activeurl/conf.py
+++ b/django_activeurl/conf.py
@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from appconf import AppConf
 from django.conf import settings  # noqa
 
 
 class ActiveUrlConf(AppConf):
-    '''default settings for django-activeurl'''
+    """default settings for django-activeurl"""
 
     # flipper for caching feature
     CACHE = True
diff --git a/django_activeurl/models.py b/django_activeurl/models.py
index 9558f0e..3ecf4dc 100644
--- a/django_activeurl/models.py
+++ b/django_activeurl/models.py
@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
-'''hello django test runner'''  # pragma: no cover
-from __future__ import absolute_import, unicode_literals  # pragma: no cover
+"""hello django test runner"""  # pragma: no cover
diff --git a/django_activeurl/templatetags/activeurl.py b/django_activeurl/templatetags/activeurl.py
index 851aa99..a96765f 100644
--- a/django_activeurl/templatetags/activeurl.py
+++ b/django_activeurl/templatetags/activeurl.py
@@ -1,21 +1,18 @@
 # -*- coding: utf-8 -*-
-'''activeurl django template library'''
-from __future__ import absolute_import, unicode_literals
-
+"""activeurl django template library"""
 from classytags.arguments import MultiKeywordArgument
 from classytags.core import Options, Tag
 from django import template
 
-from ..utils import Configuration, render_content
+from django_activeurl.utils import Configuration, render_content
 
 # django template library
 register = template.Library()
 
 
+@register.tag(name='activeurl')
 class ActiveUrl(Tag, Configuration):
-    '''django template tag via django-classy-tags'''
-    # tag name
-    name = 'activeurl'
+    """django template tag via django-classy-tags"""
 
     # template tag arguments
     options = Options(
@@ -25,7 +22,7 @@ class ActiveUrl(Tag, Configuration):
     )
 
     def render_tag(self, context, kwargs, nodelist):
-        '''render content with "active" urls logic'''
+        """render content with "active" urls logic"""
         # load configuration from passed options
         self.load_configuration(**kwargs)
 
@@ -51,7 +48,3 @@ def render_tag(self, context, kwargs, nodelist):
         )
 
         return content
-
-
-# register new template tag
-register.tag(ActiveUrl)
diff --git a/django_activeurl/utils.py b/django_activeurl/utils.py
index 8821dd5..04a2967 100644
--- a/django_activeurl/utils.py
+++ b/django_activeurl/utils.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-'''template engine independent utils'''
-from __future__ import absolute_import, unicode_literals
-
+"""template engine independent utils"""
 from hashlib import md5
 from urllib.parse import quote
 
@@ -13,22 +11,19 @@
 from .__about__ import __version__
 from .conf import settings
 
-try:
-    from django.utils.six.moves.urllib import parse as urlparse
-except ImportError:
-    from urllib import parse as urlparse
+from urllib import parse as urlparse
 
 
 class ImproperlyConfigured(Exception):
-    '''django-like ImproperlyConfigured exception'''
+    """django-like ImproperlyConfigured exception"""
     pass
 
 
 class Configuration(object):
-    '''abstract configuration'''
+    """abstract configuration"""
 
     def load_configuration(self, **kwargs):
-        '''load configuration, merge with default settings'''
+        """load configuration, merge with default settings"""
         # update passed arguments with default values
         for key in settings.ACTIVE_URL_KWARGS:
             kwargs.setdefault(key, settings.ACTIVE_URL_KWARGS[key])
@@ -44,7 +39,7 @@ def load_configuration(self, **kwargs):
 
 
 def get_cache_key(content, **kwargs):
-    '''generate cache key'''
+    """generate cache key"""
     cache_key = ''
     for key in sorted(kwargs.keys()):
         cache_key = '{cache_key}.{key}:{value}'.format(
@@ -104,7 +99,7 @@ def yesno_to_bool(value, varname):
 
 
 def check_active(url, element, **kwargs):
-    '''check "active" url, apply css_class'''
+    """check "active" url, apply css_class"""
     menu = yesno_to_bool(kwargs['menu'], 'menu')
     ignore_params = yesno_to_bool(kwargs['ignore_params'], 'ignore_params')
 
@@ -190,7 +185,7 @@ def check_active(url, element, **kwargs):
 
 
 def check_content(content, **kwargs):
-    '''check content for "active" urls'''
+    """check content for "active" urls"""
     # valid html root tag
     try:
         # render elements tree from content
@@ -202,9 +197,9 @@ def check_content(content, **kwargs):
             if not kwargs['parent_tag']:
                 kwargs['parent_tag'] = 'self'
             else:
-                raise ImproperlyConfigured('''
+                raise ImproperlyConfigured("""
                     parent_tag=True is not allowed
-                ''')
+                """)
         elif kwargs['parent_tag'] is None:
             kwargs['parent_tag'] = 'self'
         # if parent_tag is False\None\''\a\self
@@ -241,7 +236,7 @@ def check_content(content, **kwargs):
     # not valid html root tag
     except ParserError:
         # raise an exception with configuration example
-        raise ImproperlyConfigured('''
+        raise ImproperlyConfigured("""
             content of {% activeurl %} must have valid html root tag
             for example
                 {% activeurl %}
@@ -255,12 +250,12 @@ def check_content(content, **kwargs):
                     </ul>
                 {% endactiveurl %}
             in this case <ul> is valid content root tag
-        ''')
+        """)
     return content
 
 
 def render_content(content, **kwargs):
-    '''check content for "active" urls, store results to django cache'''
+    """check content for "active" urls, store results to django cache"""
     # try to take pre rendered content from django cache, if caching is enabled
     if settings.ACTIVE_URL_CACHE:
         cache_key = get_cache_key(content, **kwargs)
diff --git a/pytest.ini b/pytest.ini
index 9b402df..c17fda1 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-addopts= -s --strict --keep-duplicates --cache-clear --verbose --maxfail=1 --no-cov-on-fail --cov=django_activeurl --cov-report=term --cov-report=html
+addopts= -s --strict-markers --keep-duplicates --cache-clear --verbose --maxfail=1 --no-cov-on-fail --cov=django_activeurl --cov-report=term --cov-report=html
diff --git a/tests/urls.py b/tests/urls.py
index 4906af9..22221b0 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
-from django.conf.urls import url
 from django.http import HttpResponse
 from django.shortcuts import render
+from django.urls import re_path
 
 
 def view(request):
@@ -19,12 +17,12 @@ def jinja_template_view(request):
 
 
 urlpatterns = [
-    url(r'^$', view),
-    url(r'^template/django/$', djnago_template_view),
-    url(r'^template/jinja/$', jinja_template_view),
-    url(r'^page/$', view),
-    url(r'^menu/$', view),
-    url(r'^menu/submenu/$', view),
-    url(r'^страница/$', view),
-    url(r'^другая_страница/$', view, name='non-ascii-reverse'),
+    re_path(r'^$', view),
+    re_path(r'^template/django/$', djnago_template_view),
+    re_path(r'^template/jinja/$', jinja_template_view),
+    re_path(r'^page/$', view),
+    re_path(r'^menu/$', view),
+    re_path(r'^menu/submenu/$', view),
+    re_path(r'^страница/$', view),
+    re_path(r'^другая_страница/$', view, name='non-ascii-reverse'),
 ]
diff --git a/tox.ini b/tox.ini
index 375e66a..a6c812b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,6 @@
 [tox]
 envlist =
-	{py36}-dj22
-	{py36}-dj30
-	{py36}-djmaster
+	{py310}-dj4
 
 [testenv]
 commands = pytest tests
@@ -11,30 +9,14 @@ deps =
 	pytest
 	pytest-cov
 	jinja2
-	dj22: Django>=2.2,<2.3
-	dj30: Django>=3.0,<3.1
-	djmaster: https://github.com/django/django/archive/master.tar.gz
+	dj4: Django>=3.2,<4.2
 
-[testenv:py27-flake8]
+[testenv:py39-flake8]
 deps =
 	flake8
 commands = flake8 --show-source django_activeurl tests setup.py
 
-[testenv:py36-flake8]
-deps =
-	flake8
-commands = flake8 --show-source django_activeurl tests setup.py
-
-[testenv:py27-isort]
-deps =
-	jinja2
-	isort
-commands =
-	isort --check-only -rc django_activeurl --diff
-	isort --check-only -rc tests --diff
-	isort --check-only setup.py --diff
-
-[testenv:py36-isort]
+[testenv:py39-isort]
 deps =
 	jinja2
 	isort

From edee9d7fa09e5ce61eda0b1c827941800be3ec36 Mon Sep 17 00:00:00 2001
From: Christian Wiegand <christianwgd@users.noreply.github.com>
Date: Fri, 23 Sep 2022 12:00:24 +0200
Subject: [PATCH 3/4] Drop django < 3.2 support

---
 .gitignore              |  1 +
 setup.py                | 10 +++-------
 tests/__init__.py       |  2 --
 tests/jinja_config.py   | 10 +---------
 tests/test_activeurl.py | 23 ++++++++++-------------
 tests/urls.py           | 20 ++++++++++----------
 tests/views.py          |  2 --
 7 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index a597499..c225d0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ __pycache__
 *~
 .cache
 htmlcov
+.idea
diff --git a/setup.py b/setup.py
index 80f8910..fded219 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import io
 
 from setuptools import setup
@@ -19,12 +17,10 @@
 Development Status :: 5 - Production/Stable
 Natural Language :: English
 Programming Language :: Python
-Programming Language :: Python :: 2
-Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.4
-Programming Language :: Python :: 3.5
-Programming Language :: Python :: 3.6
+Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
+Programming Language :: Python :: 3.10
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: PyPy
 Operating System :: MacOS :: MacOS X
diff --git a/tests/__init__.py b/tests/__init__.py
index dce806f..bd3363d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 import django
diff --git a/tests/jinja_config.py b/tests/jinja_config.py
index 1068def..1eb3417 100644
--- a/tests/jinja_config.py
+++ b/tests/jinja_config.py
@@ -1,16 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from jinja2 import Environment
 
 from django_activeurl.ext.django_jinja import ActiveUrl
-
-try:
-    # django < 2
-    from django.core.urlresolvers import reverse
-except ImportError:
-    # django > 2
-    from django.urls import reverse
+from django.urls import reverse
 
 
 def environment(**options):
diff --git a/tests/test_activeurl.py b/tests/test_activeurl.py
index 0fe9ffb..cabe38e 100644
--- a/tests/test_activeurl.py
+++ b/tests/test_activeurl.py
@@ -1,32 +1,29 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from hashlib import md5
 
 from django.core.cache import cache
 from django.template import Context, Template
 from django.test.client import Client, RequestFactory
 from django.utils.translation import get_language
+from django.template.engine import Engine
 from lxml.html import fragment_fromstring, fromstring
 
 from django_activeurl import __version__
 from django_activeurl.conf import settings
 from django_activeurl.utils import ImproperlyConfigured
 
-try:
-    # django >= 1.7
-    from django.template.base import add_to_builtins
-except ImportError:
-    # django >= 1.9
-    def add_to_builtins(module):
-        from django.template.engine import Engine
-        template_engine = Engine.get_default()
-        template_engine.builtins.append(module)
-        template_engine.template_builtins = \
-            template_engine.get_template_builtins(template_engine.builtins)
+
+def add_to_builtins(module):
+    template_engine = Engine.get_default()
+    template_engine.builtins.append(module)
+    template_engine.template_builtins = template_engine.get_template_builtins(
+        template_engine.builtins
+    )
+
 
 add_to_builtins('django_activeurl.templatetags.activeurl')
 
+
 requests = RequestFactory()
 client = Client()
 
diff --git a/tests/urls.py b/tests/urls.py
index 22221b0..af4bc6d 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 from django.http import HttpResponse
 from django.shortcuts import render
-from django.urls import re_path
+from django.urls import path
 
 
 def view(request):
     return HttpResponse()
 
 
-def djnago_template_view(request):
+def django_template_view(request):
     return render(request, 'django.html', {})
 
 
@@ -17,12 +17,12 @@ def jinja_template_view(request):
 
 
 urlpatterns = [
-    re_path(r'^$', view),
-    re_path(r'^template/django/$', djnago_template_view),
-    re_path(r'^template/jinja/$', jinja_template_view),
-    re_path(r'^page/$', view),
-    re_path(r'^menu/$', view),
-    re_path(r'^menu/submenu/$', view),
-    re_path(r'^страница/$', view),
-    re_path(r'^другая_страница/$', view, name='non-ascii-reverse'),
+    path('', view),
+    path('template/django/', django_template_view),
+    path('template/jinja/', jinja_template_view),
+    path('page/', view),
+    path('menu/', view),
+    path('menu/submenu/', view),
+    path('страница/', view),
+    path('другая_страница/', view, name='non-ascii-reverse'),
 ]
diff --git a/tests/views.py b/tests/views.py
index f76fcbb..0eb228e 100644
--- a/tests/views.py
+++ b/tests/views.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from django.http import HttpResponse
 from django.shortcuts import render
 

From 361f8edaacedb2de9df828131ab8a4f41eaf31fa Mon Sep 17 00:00:00 2001
From: Christian Wiegand <christianwgd@users.noreply.github.com>
Date: Mon, 26 Sep 2022 15:04:42 +0200
Subject: [PATCH 4/4] Remove __future__ imports

---
 django_activeurl/__init__.py              | 2 --
 django_activeurl/ext/__init__.py          | 1 -
 django_activeurl/ext/django_jinja.py      | 2 --
 django_activeurl/templatetags/__init__.py | 1 -
 4 files changed, 6 deletions(-)

diff --git a/django_activeurl/__init__.py b/django_activeurl/__init__.py
index 96706af..604463e 100644
--- a/django_activeurl/__init__.py
+++ b/django_activeurl/__init__.py
@@ -1,4 +1,2 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from .__about__ import __version__  # noqa
diff --git a/django_activeurl/ext/__init__.py b/django_activeurl/ext/__init__.py
index 2c7594d..0b72afa 100644
--- a/django_activeurl/ext/__init__.py
+++ b/django_activeurl/ext/__init__.py
@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
 '''jinja port'''
-from __future__ import absolute_import, unicode_literals
diff --git a/django_activeurl/ext/django_jinja.py b/django_activeurl/ext/django_jinja.py
index 445b544..79f006b 100644
--- a/django_activeurl/ext/django_jinja.py
+++ b/django_activeurl/ext/django_jinja.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 '''jinja extenions for django_jinja/django 1.8+'''
-from __future__ import absolute_import, unicode_literals
-
 from jinja2 import lexer, nodes
 from jinja2.ext import Extension
 
diff --git a/django_activeurl/templatetags/__init__.py b/django_activeurl/templatetags/__init__.py
index 1170ec4..3aca112 100644
--- a/django_activeurl/templatetags/__init__.py
+++ b/django_activeurl/templatetags/__init__.py
@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
 '''django template tags'''
-from __future__ import absolute_import, unicode_literals