From bee658946746cc5794faa7da2b0e3acefec132ca Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Tue, 10 Apr 2018 14:35:27 +0100
Subject: [PATCH 1/7] Adding class to list item

---
 .../templates/object_tools/inclusion_tags/object_tools.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object_tools/templates/object_tools/inclusion_tags/object_tools.html b/object_tools/templates/object_tools/inclusion_tags/object_tools.html
index 530573e..df75350 100644
--- a/object_tools/templates/object_tools/inclusion_tags/object_tools.html
+++ b/object_tools/templates/object_tools/inclusion_tags/object_tools.html
@@ -1,3 +1,3 @@
 {% for object_tool in object_tools %}
-<li><a href="{{ object_tool.reverse }}{% if request %}?{{ request.GET.urlencode }}{% endif %}" title="{{ object_tool.help_text }}"class="historylink">{{ object_tool.label }}</a></li>
+<li class="{{ object_tool.label|slugify }}"><a href="{{ object_tool.reverse }}{% if request %}?{{ request.GET.urlencode }}{% endif %}" title="{{ object_tool.help_text }}"class="historylink">{{ object_tool.label }}</a></li>
 {% endfor %}

From 4c2424677a946d7df277fe0f78347331a4745d94 Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Tue, 10 Apr 2018 14:40:35 +0100
Subject: [PATCH 2/7] Adding class to list item

---
 .../templates/object_tools/inclusion_tags/object_tools.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object_tools/templates/object_tools/inclusion_tags/object_tools.html b/object_tools/templates/object_tools/inclusion_tags/object_tools.html
index df75350..2697e25 100644
--- a/object_tools/templates/object_tools/inclusion_tags/object_tools.html
+++ b/object_tools/templates/object_tools/inclusion_tags/object_tools.html
@@ -1,3 +1,3 @@
 {% for object_tool in object_tools %}
-<li class="{{ object_tool.label|slugify }}"><a href="{{ object_tool.reverse }}{% if request %}?{{ request.GET.urlencode }}{% endif %}" title="{{ object_tool.help_text }}"class="historylink">{{ object_tool.label }}</a></li>
+<li class="{{ object_tool.name|slugify }}"><a href="{{ object_tool.reverse }}{% if request %}?{{ request.GET.urlencode }}{% endif %}" title="{{ object_tool.help_text }}"class="historylink">{{ object_tool.label }}</a></li>
 {% endfor %}

From d61516c2901c6c202949f4c0f345369e929c678f Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Tue, 10 Apr 2018 14:43:23 +0100
Subject: [PATCH 3/7] Adding class to list item

---
 .../templates/object_tools/inclusion_tags/object_tools.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object_tools/templates/object_tools/inclusion_tags/object_tools.html b/object_tools/templates/object_tools/inclusion_tags/object_tools.html
index 2697e25..66ddad0 100644
--- a/object_tools/templates/object_tools/inclusion_tags/object_tools.html
+++ b/object_tools/templates/object_tools/inclusion_tags/object_tools.html
@@ -1,3 +1,3 @@
 {% for object_tool in object_tools %}
-<li class="{{ object_tool.name|slugify }}"><a href="{{ object_tool.reverse }}{% if request %}?{{ request.GET.urlencode }}{% endif %}" title="{{ object_tool.help_text }}"class="historylink">{{ object_tool.label }}</a></li>
+<li class="{{ object_tool.name|slugify }}"><a href="{{ object_tool.reverse }}{% if request %}?{{ request.GET.urlencode }}{% endif %}" title="{{ object_tool.help_text }}" class="historylink">{{ object_tool.label }}</a></li>
 {% endfor %}

From 4e6c86661f44ad87442387b6c858a411fcc23ece Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Wed, 5 Dec 2018 17:04:14 +0000
Subject: [PATCH 4/7] Updating for Django 2.0

---
 object_tools/options.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/object_tools/options.py b/object_tools/options.py
index f8c045a..713afd2 100644
--- a/object_tools/options.py
+++ b/object_tools/options.py
@@ -5,10 +5,12 @@
 from django.conf.urls import url
 from django.contrib.admin import helpers
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
-
+try:
+    from django.urls import reverse
+except ImportError:  # Django<2.0
+    from django.core.urlresolvers import reverse
 csrf_protect_m = method_decorator(csrf_protect)
 
 

From 6a33f1dedb2445b7830ecb6afb32d9f897cd462a Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Fri, 23 Aug 2019 16:36:58 +0100
Subject: [PATCH 5/7] Upgrading for Django 2.2

---
 object_tools/sites.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object_tools/sites.py b/object_tools/sites.py
index fd56d93..02fb202 100644
--- a/object_tools/sites.py
+++ b/object_tools/sites.py
@@ -89,7 +89,7 @@ def get_urls(self):
 
     @property
     def urls(self):
-        return self.get_urls(), self.app_name, self.name
+        return (self.get_urls(), self.app_name), self.name
 
 # This global object represents the default object tools, for the common case.
 # You can instantiate ObjectTools in your own code to create a

From 1bfc7a3dd09f98812aff9e2f5e31b4b951448943 Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Fri, 23 Aug 2019 18:24:49 +0100
Subject: [PATCH 6/7] Upgrading for Django 2.2

---
 object_tools/sites.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object_tools/sites.py b/object_tools/sites.py
index 02fb202..158d28f 100644
--- a/object_tools/sites.py
+++ b/object_tools/sites.py
@@ -89,7 +89,7 @@ def get_urls(self):
 
     @property
     def urls(self):
-        return (self.get_urls(), self.app_name), self.name
+        return self.get_urls(), self.app_name  # ), self.name
 
 # This global object represents the default object tools, for the common case.
 # You can instantiate ObjectTools in your own code to create a

From 7c18b2e0b6f59f5d8b77926e082fa51a5af60605 Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Fri, 8 Mar 2024 11:00:39 +0000
Subject: [PATCH 7/7] Updating for Django 4.2

---
 object_tools/__init__.py                      |  8 +--
 object_tools/options.py                       |  6 +--
 object_tools/sites.py                         |  4 +-
 .../tests/test_object_tool_creation.py        | 50 ++++++-------------
 .../tests/test_object_tools_config.py         | 26 +++-------
 object_tools/tests/urls.py                    | 21 +++-----
 6 files changed, 36 insertions(+), 79 deletions(-)

diff --git a/object_tools/__init__.py b/object_tools/__init__.py
index 328b7a6..e110b3a 100644
--- a/object_tools/__init__.py
+++ b/object_tools/__init__.py
@@ -29,10 +29,6 @@ def old_autodiscover():
 
 
 def autodiscover():
-    if django.VERSION < (1, 7):
-        old_autodiscover()
-    else:
-        from django.utils.module_loading import autodiscover_modules
-        autodiscover_modules('tools', register_to=tools)
+    from django.utils.module_loading import autodiscover_modules
+    autodiscover_modules('tools', register_to=tools)
 
-default_app_config = 'object_tools.apps.ObjectToolsAppConfig'
diff --git a/object_tools/options.py b/object_tools/options.py
index 511b780..ae19ac4 100644
--- a/object_tools/options.py
+++ b/object_tools/options.py
@@ -2,7 +2,7 @@
 
 from django import forms
 from django.conf import settings
-from django.conf.urls import url
+from django.urls import re_path
 from django.contrib.admin import helpers
 from django.core.exceptions import PermissionDenied
 from django.utils.decorators import method_decorator
@@ -10,7 +10,7 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse
+    from django.urls import reverse
 
 csrf_protect_m = method_decorator(csrf_protect)
 
@@ -102,7 +102,7 @@ def _urls(self):
             self.name,
         )
         urlpatterns = [
-            url(r'^%s/$' % self.name, self._view, name='%s_%s_%s' % info)
+            re_path(r'^%s/$' % self.name, self._view, name='%s_%s_%s' % info)
         ]
         return urlpatterns
     urls = property(_urls)
diff --git a/object_tools/sites.py b/object_tools/sites.py
index 158d28f..cc69952 100644
--- a/object_tools/sites.py
+++ b/object_tools/sites.py
@@ -68,7 +68,7 @@ def get_urls(self):
         try:
             from django.conf.urls.defaults import url, include
         except ImportError:
-            from django.conf.urls import url, include
+            from django.urls import include, re_path
 
         urlpatterns = []
 
@@ -83,7 +83,7 @@ def get_urls(self):
 
             for object_tool in object_tools:
                 urlpatterns.append(
-                    url(r'^%s/%s/' % info, include(object_tool.urls))
+                    re_path(r'^%s/%s/' % info, include(object_tool.urls))
                 )
         return urlpatterns
 
diff --git a/object_tools/tests/test_object_tool_creation.py b/object_tools/tests/test_object_tool_creation.py
index df25cda..f66d302 100644
--- a/object_tools/tests/test_object_tool_creation.py
+++ b/object_tools/tests/test_object_tool_creation.py
@@ -66,40 +66,24 @@ def test_media(self):
         form = tool.construct_form(MockRequest())
         media = tool.media(form)
 
-        if django.VERSION >= (2, 0):
-            media_js_list = [
-                '<script type="text/javascript" src="/static/admin/js/\
+        media_js_list = [
+            '<script type="text/javascript" src="/static/admin/js/\
 core.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 admin/RelatedObjectLookups.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 jquery.min.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 jquery.init.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 vendor/jquery/jquery.min.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 jquery.init.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 calendar.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
+            '<script type="text/javascript" src="/static/admin/js/\
 admin/DateTimeShortcuts.js"></script>'
-            ]
-        else:
-            media_js_list = [
-                '<script type="text/javascript" src="/static/admin/js/\
-core.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
-admin/RelatedObjectLookups.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
-jquery.min.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
-jquery.init.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
-calendar.js"></script>',
-                '<script type="text/javascript" src="/static/admin/js/\
-admin/DateTimeShortcuts.js"></script>'
-            ]
+        ]
 
         # Media result should also include field specific media.
         self.assertEqual(media.render_js(), media_js_list)
@@ -120,16 +104,10 @@ def test_urls(self):
         urls = tool.urls
         self.assertEqual(len(urls), 1, 'urls property should only \
                 return 1 url')
-        if django.VERSION >= (2, 0):
-            self.assertEqual(
-                urls[0].__repr__(),
-                "<URLPattern '^test_tool/$' [name='auth_user_test_tool']>"
-            )
-        else:
-            self.assertEqual(
-                urls[0].__repr__(),
-                '<RegexURLPattern auth_user_test_tool ^test_tool/$>'
-            )
+        self.assertEqual(
+            urls[0].__repr__(),
+            "<URLPattern '^test_tool/$' [name='auth_user_test_tool']>"
+        )
         self.assertEqual(
             urls[0].name, 'auth_user_test_tool',
             'URL should be named as "<app_label>_<model_name>_<tool_name>".'
diff --git a/object_tools/tests/test_object_tools_config.py b/object_tools/tests/test_object_tools_config.py
index e6b562b..62075c8 100644
--- a/object_tools/tests/test_object_tools_config.py
+++ b/object_tools/tests/test_object_tools_config.py
@@ -107,24 +107,14 @@ def test_urls(self):
         urls = tools.urls
         self.assertEqual(len(urls[0]), 6)
 
-        if django.VERSION >= (2, 0):
-            urlpatterns = [
-                "<URLPattern '^test_tool/$' [name='sessions_session_test_tool']>",
-                "<URLPattern '^test_tool/$' [name='auth_user_test_tool']>",
-                "<URLPattern '^test_tool/$' [name='auth_group_test_tool']>",
-                "<URLPattern '^test_tool/$' [name='auth_permission_test_tool']>",
-                "<URLPattern '^test_tool/$' [name='contenttypes_contenttype_test_tool']>",
-                "<URLPattern '^test_tool/$' [name='admin_logentry_test_tool']>",
-            ]
-        else:
-            urlpatterns = [
-                '<RegexURLPattern sessions_session_test_tool ^test_tool/$>',
-                '<RegexURLPattern auth_user_test_tool ^test_tool/$>',
-                '<RegexURLPattern auth_group_test_tool ^test_tool/$>',
-                '<RegexURLPattern auth_permission_test_tool ^test_tool/$>',
-                '<RegexURLPattern contenttypes_contenttype_test_tool ^test_tool/$>',
-                '<RegexURLPattern admin_logentry_test_tool ^test_tool/$>'
-            ]
+        urlpatterns = [
+            "<URLPattern '^test_tool/$' [name='sessions_session_test_tool']>",
+            "<URLPattern '^test_tool/$' [name='auth_user_test_tool']>",
+            "<URLPattern '^test_tool/$' [name='auth_group_test_tool']>",
+            "<URLPattern '^test_tool/$' [name='auth_permission_test_tool']>",
+            "<URLPattern '^test_tool/$' [name='contenttypes_contenttype_test_tool']>",
+            "<URLPattern '^test_tool/$' [name='admin_logentry_test_tool']>",
+        ]
 
         for url in urls[0]:
             self.assertTrue(url.url_patterns[0].__repr__() in urlpatterns)
diff --git a/object_tools/tests/urls.py b/object_tools/tests/urls.py
index 1f6f746..2268b1e 100644
--- a/object_tools/tests/urls.py
+++ b/object_tools/tests/urls.py
@@ -2,23 +2,16 @@
 import object_tools
 from django.contrib import admin
 
-if django.VERSION >= (2, 0):
-    from django.urls import path
-
-    urlpatterns = [
-        path('admin/', admin.site.urls),
-        path('object-tools/', object_tools.tools.urls),
-    ]
-else:
-    try:
-        from django.conf.urls.defaults import include, url
-    except ImportError:
-        from django.conf.urls import include, url
+from django.urls import path
 
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('object-tools/', object_tools.tools.urls),
+]
     admin.autodiscover()
     object_tools.autodiscover()
 
     urlpatterns = [
-        url(r'^admin/', include(admin.site.urls)),
-        url(r'^object-tools/', include(object_tools.tools.urls)),
+        path('admin/', include(admin.site.urls)),
+        path('object-tools/', include(object_tools.tools.urls)),
     ]