chore: Apply pyupgrade for 3.10+ syntax

pyupgrade --py310-plus modeltranslation/**/*.py

Author: last-partizan

modeltranslation/_compat.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
+from collections.abc import Callable
 
 import django
-from typing import Iterable
-from typing import Optional
+from collections.abc import Iterable
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet
@@ -32,7 +32,7 @@ def clear_ForeignObjectRel_caches(field: ForeignObjectRel):
 
 def build_refresh_from_db(
     old_refresh_from_db: Callable[
-        [Any, Optional[str], Optional[Iterable[str]], QuerySet[Any] | None], None
+        [Any, str | None, Iterable[str] | None, QuerySet[Any] | None], None
     ],
 ):
     from modeltranslation.manager import append_translated
@@ -57,7 +57,7 @@ def is_hidden(field: ForeignObjectRel) -> bool:
 
     # Django versions below 5.1 do not have `from_queryset` argument.
     def build_refresh_from_db(  # type: ignore[misc]
-        old_refresh_from_db: Callable[[Any, Optional[str], Optional[Iterable[str]]], None],
+        old_refresh_from_db: Callable[[Any, str | None, Iterable[str] | None], None],
     ):
         from modeltranslation.manager import append_translated
 

modeltranslation/_typing.py

@@ -1,15 +1,12 @@
 from __future__ import annotations
 
-import sys
 from typing import Literal, TypeVar, Union
 
 from django.contrib import admin
 from django.contrib.admin.options import BaseModelAdmin
 
-if sys.version_info >= (3, 11):
-    from typing import Self, TypeAlias  # noqa: F401
-else:
-    from typing_extensions import Self, TypeAlias  # noqa: F401
+from typing_extensions import Self  # noqa: F401
+from typing import TypeAlias
 
 AutoPopulate: TypeAlias = "bool | Literal['all', 'default', 'required']"
 

modeltranslation/admin.py

@@ -81,7 +81,7 @@ def patch_translation_field(
             if field.required:
                 field.required = False
                 field.blank = True
-                self._orig_was_required["%s.%s" % (db_field.model._meta, db_field.name)] = True
+                self._orig_was_required["{}.{}".format(db_field.model._meta, db_field.name)] = True
 
         # For every localized field copy the widget from the original field
         # and add a css class to identify a modeltranslation widget.
@@ -131,7 +131,7 @@ def patch_translation_field(
                 # Add another css class to identify a default modeltranslation widget
                 css_classes.append("mt-default")
                 if orig_formfield.required or self._orig_was_required.get(
-                    "%s.%s" % (orig_field.model._meta, orig_field.name)
+                    "{}.{}".format(orig_field.model._meta, orig_field.name)
                 ):
                     # In case the original form field was required, make the
                     # default translation field required instead.

modeltranslation/decorators.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
+from collections.abc import Callable
 from collections.abc import Iterable
 
 from django.db.models import Model

modeltranslation/fields.py

@@ -198,7 +198,7 @@ def __init__(
                 self.remote_field.related_name = "%s_rel_+" % self.name
             elif is_hidden(self.remote_field):
                 # Even if the backwards relation is disabled, django internally uses it, need to use a language scoped related_name
-                self.remote_field.related_name = "_%s_%s_+" % (
+                self.remote_field.related_name = "_{}_{}_+".format(
                     self.model.__name__.lower(),
                     self.name,
                 )
@@ -210,7 +210,7 @@ def __init__(
                         self.related_query_name(), self.language
                     )
                     self.related_query_name = lambda: loc_related_query_name
-                    self.remote_field.related_name = "%s_set" % (
+                    self.remote_field.related_name = "{}_set".format(
                         build_localized_fieldname(self.model.__name__.lower(), language),
                     )
                 else:

modeltranslation/management/commands/loaddata.py

@@ -27,7 +27,7 @@ def check_mode(
     if value == "0" or value.lower() == "false":
         value = False  # type: ignore[assignment]
     if value not in ALLOWED:
-        raise ValueError("%s option can be only one of: %s" % (opt_str, ALLOWED_FOR_PRINT))
+        raise ValueError("{} option can be only one of: {}".format(opt_str, ALLOWED_FOR_PRINT))
     setattr(namespace or parser.values, option.dest, value)  # type: ignore[attr-defined]
 
 

modeltranslation/management/commands/sync_translation_fields.py

@@ -82,7 +82,7 @@ def handle(self, *args: Any, **options: Any) -> None:
         for model in models:
             db_table = model._meta.db_table
             model_name = model._meta.model_name
-            model_full_name = "%s.%s" % (model._meta.app_label, model_name)
+            model_full_name = "{}.{}".format(model._meta.app_label, model_name)
             opts = translator.get_options_for_model(model)
             for field_name, fields in opts.local_fields.items():
                 # Take `db_column` attribute into account
@@ -144,7 +144,7 @@ def get_sync_sql(
             col_type = f.db_type(connection=connection)
             field_sql = [style.SQL_FIELD(qn(f.column)), style.SQL_COLTYPE(col_type)]  # type: ignore[arg-type]
             # column creation
-            stmt = "ALTER TABLE %s ADD COLUMN %s" % (qn(db_table), " ".join(field_sql))
+            stmt = "ALTER TABLE {} ADD COLUMN {}".format(qn(db_table), " ".join(field_sql))
             if not f.null:
                 stmt += " " + style.SQL_KEYWORD("NOT NULL")
             sql_output.append(stmt + ";")

modeltranslation/manager.py

@@ -117,7 +117,7 @@ def append_lookup_key(model: type[Model], lookup_key: str) -> set[str]:
             rest = append_lookup_key(transmodel, pieces[1])
             fields = {"__".join(pr) for pr in itertools.product(fields, rest)}
         else:
-            fields = {"%s__%s" % (f, pieces[1]) for f in fields}
+            fields = {"{}__{}".format(f, pieces[1]) for f in fields}
     return fields
 
 

modeltranslation/settings.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Callable
+from collections.abc import Callable
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

modeltranslation/tests/models.py

@@ -160,7 +160,7 @@ class CustomThroughModel(models.Model):
 
     @property
     def test_property(self):
-        return "%s_%s" % (self.__class__.__name__, self.rel_1_id)
+        return "{}_{}".format(self.__class__.__name__, self.rel_1_id)
 
     def test_method(self):
         return self.rel_1_id + 1