Update dependencies to support Django 4.2

src/django_handleref/admin.py

@@ -3,12 +3,12 @@
 import traceback
 
 from django import forms
-from django.conf.urls import re_path
 from django.contrib import admin
 from django.contrib.admin.views.main import ChangeList
 from django.core.exceptions import ValidationError
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import re_path
 from django.utils.translation import gettext_lazy as _
 
 # soft import reversion - since it is not a hard
@@ -123,7 +123,6 @@ def history_query_set(self, object_id):
         return history_qset
 
     def history_entry(self, version, previous):
-
         """
         Compile object history list entry dict
 
@@ -186,7 +185,6 @@ def history(self, history_qset):
         return history
 
     def history_view(self, request, object_id):
-
         """
         object history view
         """
@@ -225,7 +223,6 @@ def history_view(self, request, object_id):
         return super().history_view(request, object_id, context)
 
     def version_details_view(self, request, object_id, version_id, extra_context=None):
-
         """
         Show version details
         """
@@ -251,7 +248,6 @@ def version_details_view(self, request, object_id, version_id, extra_context=Non
         return TemplateResponse(request, self.version_details_template, context)
 
     def version_revert_view(self, request, object_id, extra_context=None):
-
         """
         Show version revert preview / confiformation view
         """
@@ -286,7 +282,6 @@ def version_revert_view(self, request, object_id, extra_context=None):
         return TemplateResponse(request, self.version_revert_template, context)
 
     def version_revert_process(self, request, object_id, extra_context=None):
-
         """
         Process revert version(s)
         """
@@ -312,21 +307,18 @@ def version_revert_process(self, request, object_id, extra_context=None):
 
         errors = {}
         try:
-
             # revert
 
             reverter = self.reverter_cls()
             instance = self.model.objects.get(pk=object_id)
             reverter.revert_fields(instance, field_versions, user=request.user)
 
         except ValidationError as exc:
-
             # validation errors are collected
 
             errors = exc.message_dict
 
         except Exception as exc:
-
             # any other errors are logged
 
             errors = {"non_field_errors": ["Internal Error (check server logs)"]}
@@ -352,7 +344,6 @@ def version_revert_process(self, request, object_id, extra_context=None):
         )
 
     def version_rollback_view(self, request, object_id, version_id, extra_context=None):
-
         """
         Version rollback preview / confirmation view
         """
@@ -377,7 +368,6 @@ def version_rollback_view(self, request, object_id, version_id, extra_context=No
     def version_rollback_process(
         self, request, object_id, version_id, extra_context=None
     ):
-
         """
         Version rollback process
         """
@@ -391,21 +381,18 @@ def version_rollback_process(
 
         errors = {}
         try:
-
             # rollback
 
             reverter = self.reverter_cls()
             instance = self.model.objects.get(pk=object_id)
             reverter.rollback(instance, version, user=request.user)
 
         except ValidationError as exc:
-
             # collect validation errors
 
             errors = exc.message_dict
 
         except Exception as exc:
-
             # log any other errors
 
             errors = {"non_field_errors": ["Internal Error (check server logs)"]}

src/django_handleref/manager.py

@@ -47,7 +47,6 @@ def since(self, timestamp=None, version=None, deleted=False):
         qset = self
 
         if timestamp is not None:
-
             if isinstance(timestamp, numbers.Real):
                 timestamp = datetime.datetime.fromtimestamp(timestamp)
 
@@ -56,17 +55,14 @@ def since(self, timestamp=None, version=None, deleted=False):
             )
 
         if version is not None:
-
             qset = qset.filter(version__gt=version)
 
         if not deleted:
-
             qset = qset.undeleted()
 
         return qset
 
     def undeleted(self):
-
         """
         Only return objects that are not soft-deleted
         """

src/django_handleref/models.py

@@ -119,7 +119,6 @@ def __unicode__(self):
         return name + "-" + self.handle
 
     def delete(self, hard=False):
-
         """
         Override the vanilla delete functionality to soft-delete
         instead. Soft-delete is accomplished by setting the

src/django_handleref/version.py

@@ -15,7 +15,6 @@ class Version:
     """
 
     def __init__(self, version):
-
         """
         Argument(s):
 
@@ -154,7 +153,6 @@ def changes(self, previous):
         return Diff(previous, self).changes
 
     def changed_fields(self, previous):
-
         """
         Return a list of changed fields between
         this version and a previous version
@@ -333,7 +331,6 @@ class Diff:
     ]
 
     def __init__(self, version_a, version_b):
-
         """
         Argument(s):
 
@@ -347,7 +344,6 @@ def __init__(self, version_a, version_b):
 
     @property
     def changes(self):
-
         """
         Compile and return a dict describing changes between
         the two versions tracked in this diff
@@ -409,7 +405,6 @@ class Reverter:
     """
 
     def revert_fields(self, instance, field_versions, **kwargs):
-
         """
         Revert a set of fields
 
@@ -434,7 +429,6 @@ def revert_fields(self, instance, field_versions, **kwargs):
         instance.save()
 
     def rollback(self, instance, version, **kwargs):
-
         """
         Rollback to a specific version
 
@@ -460,7 +454,6 @@ def rollback(self, instance, version, **kwargs):
         instance.save()
 
     def validate_status_change(self, instance, status):
-
         """
         Validate a status value change - this will make sure
         an object cannot be undeleted if a parent relationship
@@ -484,7 +477,6 @@ def validate_status_change(self, instance, status):
             self.validate_parent_status(instance, relation, status)
 
     def validate_parent_status(self, instance, parent, status):
-
         if not hasattr(parent, "HandleRef"):
             return
 
@@ -505,7 +497,6 @@ class ReversionReverter(Reverter):
     """
 
     def revert_fields(self, instance, field_versions, user=None):
-
         """
         Revert a set of fields
 
@@ -540,7 +531,6 @@ def revert_fields(self, instance, field_versions, user=None):
             super().revert_fields(instance, field_versions)
 
     def rollback(self, instance, version, user=None):
-
         """
         Rollback to a specific version
 

tests/conftest.py

@@ -60,7 +60,6 @@ def reversion_org_many():
 
 
 def pytest_configure():
-
     settings.configure(
         ROOT_URLCONF="tests.urls",
         SECRET_KEY="mPqac6DEtYxY-0Mu946UUpg-YDVmXWkYj6L4rIE15_A",

tests/test_manager.py

@@ -28,7 +28,6 @@ def test_last_change(self):
         self.assertEqual(Org.handleref.last_change(), org.updated)
 
     def test_since(self):
-
         org = self.orgs[0]
         t = time.time()
 

tests/test_version.py

@@ -28,7 +28,6 @@
     ],
 )
 def test_version_interface(field):
-
     version = Version(object())
 
     with pytest.raises(NotImplementedError):
@@ -103,7 +102,6 @@ def _test_rollback(org, versions, reverter):
 
 @pytest.mark.django_db
 def test_reversion_version_fields(db):
-
     with reversion.create_revision():
         org = VersionedOrg.objects.create(name="Test", status="ok")
 

tests/urls.py

@@ -1,9 +1,9 @@
 from django.conf import settings
-from django.conf.urls import include, re_path
 from django.conf.urls.static import static
 
 # auto admin
 from django.contrib import admin
+from django.urls import re_path
 from django.views.generic.base import RedirectView
 
 admin.autodiscover()