Update syntax to Python3.7+

Author: hramezani

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # django-simple-history documentation build configuration file, created by
 # sphinx-quickstart on Sun May  5 16:10:02 2013.

simple_history/admin.py

@@ -25,7 +25,7 @@ class SimpleHistoryAdmin(admin.ModelAdmin):
 
     def get_urls(self):
         """Returns the additional urls used by the Reversion admin."""
-        urls = super(SimpleHistoryAdmin, self).get_urls()
+        urls = super().get_urls()
         admin_site = self.admin_site
         opts = self.model._meta
         info = opts.app_label, opts.model_name
@@ -74,7 +74,7 @@ def history_view(self, request, object_id, extra_context=None):
         content_type = self.content_type_model_cls.objects.get_by_natural_key(
             *USER_NATURAL_KEY
         )
-        admin_user_view = "admin:%s_%s_change" % (
+        admin_user_view = "admin:{}_{}_change".format(
             content_type.app_label,
             content_type.model,
         )
@@ -113,12 +113,12 @@ def response_change(self, request, obj):
             }
 
             self.message_user(
-                request, "%s - %s" % (msg, _("You may edit it again below"))
+                request, "{} - {}".format(msg, _("You may edit it again below"))
             )
 
             return http.HttpResponseRedirect(request.path)
         else:
-            return super(SimpleHistoryAdmin, self).response_change(request, obj)
+            return super().response_change(request, obj)
 
     def history_form_view(self, request, object_id, version_id, extra_context=None):
         request.current_app = self.admin_site.name
@@ -224,7 +224,7 @@ def render_history_view(self, request, template, context, **kwargs):
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""
         obj._history_user = request.user
-        super(SimpleHistoryAdmin, self).save_model(request, obj, form, change)
+        super().save_model(request, obj, form, change)
 
     @property
     def content_type_model_cls(self):

simple_history/management/commands/clean_duplicate_history.py

@@ -67,7 +67,7 @@ def _process(self, to_process, date_back=None, dry_run=True):
             if stop_date:
                 m_qs = m_qs.filter(history_date__gte=stop_date)
             found = m_qs.count()
-            self.log("{0} has {1} historical entries".format(model, found), 2)
+            self.log(f"{model} has {found} historical entries", 2)
             if not found:
                 continue
 

simple_history/management/commands/clean_old_history.py

@@ -61,7 +61,7 @@ def _process(self, to_process, days_back=None, dry_run=True):
                 history_date__lt=start_date
             )
             found = history_model_manager.count()
-            self.log("{0} has {1} old historical entries".format(model, found), 2)
+            self.log(f"{model} has {found} old historical entries", 2)
             if not found:
                 continue
             if not dry_run:

simple_history/management/commands/populate_history.py

@@ -24,7 +24,7 @@ class Command(BaseCommand):
     INVALID_MODEL_ARG = "An invalid model was specified"
 
     def add_arguments(self, parser):
-        super(Command, self).add_arguments(parser)
+        super().add_arguments(parser)
         parser.add_argument("models", nargs="*", type=str)
         parser.add_argument(
             "--auto",
@@ -82,7 +82,7 @@ def _handle_model_list(self, *args):
                 model, history = self._model_from_natural_key(natural_key)
             except ValueError as e:
                 failing = True
-                self.stderr.write("{error}\n".format(error=e))
+                self.stderr.write(f"{e}\n")
             else:
                 if not failing:
                     yield (model, history)
@@ -100,12 +100,12 @@ def _model_from_natural_key(self, natural_key):
             except LookupError:
                 model = None
         if not model:
-            msg = self.MODEL_NOT_FOUND + " < {model} >\n".format(model=natural_key)
+            msg = self.MODEL_NOT_FOUND + f" < {natural_key} >\n"
             raise ValueError(msg)
         try:
             history_model = utils.get_history_model_for_model(model)
         except NotHistoricalModelError:
-            msg = self.MODEL_NOT_HISTORICAL + " < {model} >\n".format(model=natural_key)
+            msg = self.MODEL_NOT_HISTORICAL + f" < {natural_key} >\n"
             raise ValueError(msg)
         return model, history_model
 

simple_history/manager.py

@@ -20,7 +20,7 @@ class HistoricalQuerySet(QuerySet):
     """
 
     def __init__(self, *args, **kwargs):
-        super(HistoricalQuerySet, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._as_instances = False
         self._pk_attr = self.model.instance_type._meta.pk.attname
 
@@ -120,12 +120,12 @@ def __get__(self, instance, owner):
 
 class HistoryManager(models.Manager):
     def __init__(self, model, instance=None):
-        super(HistoryManager, self).__init__()
+        super().__init__()
         self.model = model
         self.instance = instance
 
     def get_super_queryset(self):
-        return super(HistoryManager, self).get_queryset()
+        return super().get_queryset()
 
     def get_queryset(self):
         qs = self.get_super_queryset()

simple_history/models.py

@@ -177,7 +177,7 @@ def finalize(self, sender, **kwargs):
 
     def get_history_model_name(self, model):
         if not self.custom_model_name:
-            return "Historical{}".format(model._meta.object_name)
+            return f"Historical{model._meta.object_name}"
         # Must be trying to use a custom history model name
         if callable(self.custom_model_name):
             name = self.custom_model_name(model._meta.object_name)
@@ -224,7 +224,7 @@ def create_history_model(self, model, inherited):
         attrs.update(fields)
         attrs.update(self.get_extra_fields(model, fields))
         # type in python2 wants str as a first argument
-        attrs.update(Meta=type(str("Meta"), (), self.get_meta_options(model)))
+        attrs.update(Meta=type("Meta", (), self.get_meta_options(model)))
         if self.table_name is not None:
             attrs["Meta"].db_table = self.table_name
 
@@ -386,7 +386,7 @@ def revert_url(self):
             opts = model._meta
             app_label, model_name = opts.app_label, opts.model_name
             return reverse(
-                "%s:%s_%s_simple_history" % (admin.site.name, app_label, model_name),
+                f"{admin.site.name}:{app_label}_{model_name}_simple_history",
                 args=[getattr(self, opts.pk.attname), self.history_id],
             )
 

simple_history/registry_tests/migration_test_app/migrations/0001_initial.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.12 on 2017-01-18 21:58
 import django.db.models.deletion
 from django.conf import settings

simple_history/registry_tests/migration_test_app/models.py

@@ -19,13 +19,13 @@ class Yar(models.Model):
 class CustomAttrNameForeignKey(models.ForeignKey):
     def __init__(self, *args, **kwargs):
         self.attr_name = kwargs.pop("attr_name", None)
-        super(CustomAttrNameForeignKey, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_attname(self):
-        return self.attr_name or super(CustomAttrNameForeignKey, self).get_attname()
+        return self.attr_name or super().get_attname()
 
     def deconstruct(self):
-        name, path, args, kwargs = super(CustomAttrNameForeignKey, self).deconstruct()
+        name, path, args, kwargs = super().deconstruct()
         if self.attr_name:
             kwargs["attr_name"] = self.attr_name
         return name, path, args, kwargs
@@ -41,15 +41,13 @@ class ModelWithCustomAttrForeignKey(models.Model):
 class CustomAttrNameOneToOneField(models.OneToOneField):
     def __init__(self, *args, **kwargs):
         self.attr_name = kwargs.pop("attr_name", None)
-        super(CustomAttrNameOneToOneField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_attname(self):
-        return self.attr_name or super(CustomAttrNameOneToOneField, self).get_attname()
+        return self.attr_name or super().get_attname()
 
     def deconstruct(self):
-        name, path, args, kwargs = super(
-            CustomAttrNameOneToOneField, self
-        ).deconstruct()
+        name, path, args, kwargs = super().deconstruct()
         if self.attr_name:
             kwargs["attr_name"] = self.attr_name
         return name, path, args, kwargs
@@ -59,6 +57,4 @@ class ModelWithCustomAttrOneToOneField(models.Model):
     what_i_mean = CustomAttrNameOneToOneField(
         WhatIMean, models.CASCADE, attr_name="custom_attr_name"
     )
-    history = HistoricalRecords(
-        excluded_field_kwargs={"what_i_mean": set(["attr_name"])}
-    )
+    history = HistoricalRecords(excluded_field_kwargs={"what_i_mean": {"attr_name"}})

simple_history/registry_tests/tests.py

@@ -105,7 +105,7 @@ class TestTrackingInheritance(TestCase):
     def test_tracked_abstract_base(self):
         self.assertEqual(
             sorted(
-                [f.attname for f in TrackedWithAbstractBase.history.model._meta.fields]
+                f.attname for f in TrackedWithAbstractBase.history.model._meta.fields
             ),
             sorted(
                 [