Used pyupgrade to remove Python 2 and 3.5 compatibility code

Author: vdboor

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # django-polymorphic documentation build configuration file, created by
 # sphinx-quickstart on Sun May 19 12:20:47 2013.
@@ -53,8 +52,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"django-polymorphic"
-copyright = u"2013, Bert Constantin, Chris Glass, Diederik van der Boor"
+project = "django-polymorphic"
+copyright = "2013, Bert Constantin, Chris Glass, Diederik van der Boor"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -198,8 +197,8 @@
     (
         "index",
         "django-polymorphic.tex",
-        u"django-polymorphic Documentation",
-        u"Bert Constantin, Chris Glass, Diederik van der Boor",
+        "django-polymorphic Documentation",
+        "Bert Constantin, Chris Glass, Diederik van der Boor",
         "manual",
     )
 ]
@@ -233,8 +232,8 @@
     (
         "index",
         "django-polymorphic",
-        u"django-polymorphic Documentation",
-        [u"Bert Constantin, Chris Glass, Diederik van der Boor"],
+        "django-polymorphic Documentation",
+        ["Bert Constantin, Chris Glass, Diederik van der Boor"],
         1,
     )
 ]
@@ -252,8 +251,8 @@
     (
         "index",
         "django-polymorphic",
-        u"django-polymorphic Documentation",
-        u"Bert Constantin, Chris Glass, Diederik van der Boor",
+        "django-polymorphic Documentation",
+        "Bert Constantin, Chris Glass, Diederik van der Boor",
         "django-polymorphic",
         "One line description of project.",
         "Miscellaneous",

example/orders/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

example/orders/models.py

@@ -35,7 +35,7 @@ class Meta:
         verbose_name_plural = _("Payments")
 
     def __str__(self):
-        return "{0} {1}".format(self.currency, self.amount)
+        return f"{self.currency} {self.amount}"
 
 
 class CreditCardPayment(Payment):

example/pexp/management/commands/p2cmd.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module is a scratchpad for general development, testing & debugging
 Well, even more so than pcmd.py. You best ignore p2cmd.py.

example/pexp/management/commands/polybench.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module is a scratchpad for general development, testing & debugging
 """

example/pexp/management/commands/polymorphic_create_test_data.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module is a scratchpad for general development, testing & debugging
 """

example/pexp/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 import polymorphic.showfields

example/pexp/models.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.db import models
 
 from polymorphic.models import PolymorphicModel
@@ -41,7 +39,7 @@ class ProxyBase(PolymorphicModel):
     title = models.CharField(max_length=200)
 
     def __unicode__(self):
-        return u"<ProxyBase[type={0}]: {1}>".format(self.polymorphic_ctype, self.title)
+        return f"<ProxyBase[type={self.polymorphic_ctype}]: {self.title}>"
 
     class Meta:
         ordering = ("title",)
@@ -52,15 +50,15 @@ class Meta:
         proxy = True
 
     def __unicode__(self):
-        return u"<ProxyA: {0}>".format(self.title)
+        return f"<ProxyA: {self.title}>"
 
 
 class ProxyB(ProxyBase):
     class Meta:
         proxy = True
 
     def __unicode__(self):
-        return u"<ProxyB: {0}>".format(self.title)
+        return f"<ProxyB: {self.title}>"
 
 
 # Internals for management command tests

polymorphic/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Seamless Polymorphic Inheritance for Django Models
 

polymorphic/admin/childadmin.py

@@ -47,7 +47,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
     show_in_index = False
 
     def __init__(self, model, admin_site, *args, **kwargs):
-        super(PolymorphicChildModelAdmin, self).__init__(
+        super().__init__(
             model, admin_site, *args, **kwargs
         )
 
@@ -68,7 +68,7 @@ def get_form(self, request, obj=None, **kwargs):
         if not self.fieldsets and not self.fields:
             kwargs.setdefault("fields", "__all__")
 
-        return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)
+        return super().get_form(request, obj, **kwargs)
 
     def get_model_perms(self, request):
         match = resolve(request.path_info)
@@ -79,7 +79,7 @@ def get_model_perms(self, request):
             and match.url_name in ("index", "app_list")
         ):
             return {"add": False, "change": False, "delete": False}
-        return super(PolymorphicChildModelAdmin, self).get_model_perms(request)
+        return super().get_model_perms(request)
 
     @property
     def change_form_template(self):
@@ -91,7 +91,7 @@ def change_form_template(self):
         base_app_label = base_opts.app_label
 
         return [
-            "admin/%s/%s/change_form.html" % (app_label, opts.object_name.lower()),
+            f"admin/{app_label}/{opts.object_name.lower()}/change_form.html",
             "admin/%s/change_form.html" % app_label,
             # Added:
             "admin/%s/%s/change_form.html"
@@ -132,7 +132,7 @@ def object_history_template(self):
         base_app_label = base_opts.app_label
 
         return [
-            "admin/%s/%s/object_history.html" % (app_label, opts.object_name.lower()),
+            f"admin/{app_label}/{opts.object_name.lower()}/object_history.html",
             "admin/%s/object_history.html" % app_label,
             # Added:
             "admin/%s/%s/object_history.html"
@@ -147,7 +147,7 @@ def _get_parent_admin(self):
         parent_model = self.model._meta.get_field("polymorphic_ctype").model
         if parent_model == self.model:
             # when parent_model is in among child_models, just return super instance
-            return super(PolymorphicChildModelAdmin, self)
+            return super()
 
         try:
             return self.admin_site._registry[parent_model]
@@ -167,7 +167,7 @@ def _get_parent_admin(self):
 
             # If we get this far without returning there is no admin available
             raise ParentAdminNotRegistered(
-                "No parent admin was registered for a '{0}' model.".format(parent_model)
+                f"No parent admin was registered for a '{parent_model}' model."
             )
 
     def response_post_save_add(self, request, obj):
@@ -180,13 +180,13 @@ def render_change_form(
         self, request, context, add=False, change=False, form_url="", obj=None
     ):
         context.update({"base_opts": self.base_model._meta})
-        return super(PolymorphicChildModelAdmin, self).render_change_form(
+        return super().render_change_form(
             request, context, add=add, change=change, form_url=form_url, obj=obj
         )
 
     def delete_view(self, request, object_id, context=None):
         extra_context = {"base_opts": self.base_model._meta}
-        return super(PolymorphicChildModelAdmin, self).delete_view(
+        return super().delete_view(
             request, object_id, extra_context
         )
 
@@ -195,7 +195,7 @@ def history_view(self, request, object_id, extra_context=None):
         context = {"base_opts": self.base_model._meta}
         if extra_context:
             context.update(extra_context)
-        return super(PolymorphicChildModelAdmin, self).history_view(
+        return super().history_view(
             request, object_id, extra_context=context
         )
 
@@ -209,7 +209,7 @@ def get_fieldsets(self, request, obj=None):
 
         # If subclass declares fieldsets or fields, this is respected
         if self.fieldsets or self.fields or not self.base_fieldsets:
-            return super(PolymorphicChildModelAdmin, self).get_fieldsets(request, obj)
+            return super().get_fieldsets(request, obj)
 
         # Have a reasonable default fieldsets,
         # where the subclass fields are automatically included.