Refs #28909 -- Simplified code using unpacking generalizations.

django · gtossou · Jan 13, 2025 · Jan 14, 2025 · Jan 1, 2025 · Oct 11, 2024
commit 3e9c36f7e721433508b39403a7aa37797bbcae4f
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
@@ -507,7 +507,7 @@ def lookup_allowed(self, lookup, value, request):
         # Is it a valid relational lookup?
         return not {
             LOOKUP_SEP.join(relation_parts),
-            LOOKUP_SEP.join(relation_parts + [part]),
+            LOOKUP_SEP.join([*relation_parts, part]),
         }.isdisjoint(valid_lookups)
 
     def to_field_allowed(self, request, to_field):
@@ -737,8 +737,7 @@ def wrapper(*args, **kwargs):
                 "<path:object_id>/",
                 wrap(
                     RedirectView.as_view(
-                        pattern_name="%s:%s_%s_change"
-                        % ((self.admin_site.name,) + info)
+                        pattern_name="%s:%s_%s_change" % (self.admin_site.name, *info)
                     )
                 ),
             ),
@@ -1051,7 +1050,7 @@ def get_action_choices(self, request, default_choices=models.BLANK_CHOICE_DASH):
         Return a list of choices for use in a form object.  Each choice is a
         tuple (name, description).
         """
-        choices = [] + default_choices
+        choices = [*default_choices]
         for func, name, description in self.get_actions(request).values():
             choice = (name, description % model_format_dict(self.opts))
             choices.append(choice)

diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
@@ -307,7 +307,7 @@ def choices(self, value):
 
     def get_related_url(self, info, action, *args):
         return reverse(
-            "admin:%s_%s_%s" % (info + (action,)),
+            "admin:%s_%s_%s" % (*info, action),
             current_app=self.admin_site.name,
             args=args,
         )
@@ -582,9 +582,7 @@ def media(self):
             js=(
                 "admin/js/vendor/jquery/jquery%s.js" % extra,
                 "admin/js/vendor/select2/select2.full%s.js" % extra,
-            )
-            + i18n_file
-            + (
+                *i18n_file,
                 "admin/js/jquery.init.js",
                 "admin/js/autocomplete.js",
             ),

diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py
@@ -104,7 +104,8 @@ def get_urls(self):
                 self.admin_site.admin_view(self.user_change_password),
                 name="auth_user_password_change",
             ),
-        ] + super().get_urls()
+            *super().get_urls(),
+        ]
 
     def lookup_allowed(self, lookup, value, request):
         # Don't allow lookups involving passwords.

diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
@@ -80,7 +80,7 @@ def __str__(self):
         return "%s | %s" % (self.content_type, self.name)
 
     def natural_key(self):
-        return (self.codename,) + self.content_type.natural_key()
+        return (self.codename, *self.content_type.natural_key())
 
     natural_key.dependencies = ["contenttypes.contenttype"]
 

diff --git a/django/contrib/auth/password_validation.py b/django/contrib/auth/password_validation.py
@@ -185,7 +185,7 @@ def validate(self, password, user=None):
             if not value or not isinstance(value, str):
                 continue
             value_lower = value.lower()
-            value_parts = re.split(r"\W+", value_lower) + [value_lower]
+            value_parts = [*re.split(r"\W+", value_lower), value_lower]
             for value_part in value_parts:
                 if exceeds_maximum_length_ratio(
                     password, self.max_similarity, value_part

diff --git a/django/contrib/gis/db/backends/postgis/introspection.py b/django/contrib/gis/db/backends/postgis/introspection.py
@@ -5,7 +5,8 @@
 class PostGISIntrospection(DatabaseIntrospection):
     postgis_oid_lookup = {}  # Populated when introspection is performed.
 
-    ignored_tables = DatabaseIntrospection.ignored_tables + [
+    ignored_tables = [
+        *DatabaseIntrospection.ignored_tables,
         "geography_columns",
         "geometry_columns",
         "raster_columns",

diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py
@@ -360,7 +360,7 @@ def postgis_version_tuple(self):
         minor, subminor).
         """
         version = self.postgis_lib_version()
-        return (version,) + get_version_tuple(version)
+        return (version, *get_version_tuple(version))
 
     def proj_version_tuple(self):
         """

diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
@@ -196,7 +196,7 @@ def spatialite_version_tuple(self):
         minor, subminor).
         """
         version = self.spatialite_version()
-        return (version,) + get_version_tuple(version)
+        return (version, *get_version_tuple(version))
 
     def spatial_aggregate_name(self, agg_name):
         """

diff --git a/django/contrib/gis/db/models/lookups.py b/django/contrib/gis/db/models/lookups.py
@@ -284,7 +284,7 @@ def process_rhs(self, compiler, connection):
         elif not isinstance(pattern, str) or not self.pattern_regex.match(pattern):
             raise ValueError('Invalid intersection matrix pattern "%s".' % pattern)
         sql, params = super().process_rhs(compiler, connection)
-        return sql, params + [pattern]
+        return sql, [*params, pattern]
 
 
 @BaseSpatialField.register_lookup

diff --git a/django/contrib/messages/storage/cookie.py b/django/contrib/messages/storage/cookie.py
@@ -149,7 +149,7 @@ def is_too_large_for_cookie(data):
 
             def compute_msg(some_serialized_msg):
                 return self._encode_parts(
-                    some_serialized_msg + [self.not_finished_json],
+                    [*some_serialized_msg, self.not_finished_json],
                     encode_empty=True,
                 )
 

diff --git a/django/contrib/postgres/fields/hstore.py b/django/contrib/postgres/fields/hstore.py
@@ -87,7 +87,7 @@ def __init__(self, key_name, *args, **kwargs):
 
     def as_sql(self, compiler, connection):
         lhs, params = compiler.compile(self.lhs)
-        return "(%s -> %%s)" % lhs, tuple(params) + (self.key_name,)
+        return "(%s -> %%s)" % lhs, (*params, self.key_name)
 
 
 class KeyTransformFactory:

diff --git a/django/contrib/postgres/search.py b/django/contrib/postgres/search.py
@@ -211,7 +211,7 @@ def __init__(
         expressions = (value,)
         self.config = SearchConfig.from_parameter(config)
         if self.config is not None:
-            expressions = (self.config,) + expressions
+            expressions = [self.config, *expressions]
         self.invert = invert
         super().__init__(*expressions, output_field=output_field)
 
@@ -258,16 +258,16 @@ def __init__(
             vector = SearchVector(vector)
         if not hasattr(query, "resolve_expression"):
             query = SearchQuery(query)
-        expressions = (vector, query)
+        expressions = [vector, query]
         if weights is not None:
             if not hasattr(weights, "resolve_expression"):
                 weights = Value(weights)
             weights = Cast(weights, ArrayField(_Float4Field()))
-            expressions = (weights,) + expressions
+            expressions = [weights, *expressions]
         if normalization is not None:
             if not hasattr(normalization, "resolve_expression"):
                 normalization = Value(normalization)
-            expressions += (normalization,)
+            expressions.append(normalization)
         if cover_density:
             self.function = "ts_rank_cd"
         super().__init__(*expressions)
@@ -311,7 +311,7 @@ def __init__(
         expressions = (expression, query)
         if config is not None:
             config = SearchConfig.from_parameter(config)
-            expressions = (config,) + expressions
+            expressions = (config, *expressions)
         super().__init__(*expressions)
 
     def as_sql(self, compiler, connection, function=None, template=None):

diff --git a/django/core/checks/urls.py b/django/core/checks/urls.py
@@ -62,7 +62,7 @@ def _load_all_namespaces(resolver, parents=()):
     """
     url_patterns = getattr(resolver, "url_patterns", [])
     namespaces = [
-        ":".join(parents + (url.namespace,))
+        ":".join([*parents, url.namespace])
         for url in url_patterns
         if getattr(url, "namespace", None) is not None
     ]

diff --git a/django/core/management/commands/compilemessages.py b/django/core/management/commands/compilemessages.py
@@ -74,7 +74,7 @@ def handle(self, **options):
         ignore_patterns = set(options["ignore_patterns"])
         self.verbosity = options["verbosity"]
         if options["fuzzy"]:
-            self.program_options = self.program_options + ["-f"]
+            self.program_options = [*self.program_options, "-f"]
 
         if find_command(self.program) is None:
             raise CommandError(

diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py
@@ -498,7 +498,7 @@ def build_potfiles(self):
             potfile = os.path.join(path, "%s.pot" % self.domain)
             if not os.path.exists(potfile):
                 continue
-            args = ["msguniq"] + self.msguniq_options + [potfile]
+            args = ["msguniq", *self.msguniq_options, potfile]
             msgs, errors, status = popen_wrapper(args)
             if errors:
                 if status != STATUS_OK:
@@ -702,7 +702,7 @@ def write_po_file(self, potfile, locale):
         pofile = os.path.join(basedir, "%s.po" % self.domain)
 
         if os.path.exists(pofile):
-            args = ["msgmerge"] + self.msgmerge_options + [pofile, potfile]
+            args = ["msgmerge", *self.msgmerge_options, pofile, potfile]
             _, errors, status = popen_wrapper(args)
             if errors:
                 if status != STATUS_OK:
@@ -725,7 +725,7 @@ def write_po_file(self, potfile, locale):
             fp.write(msgs)
 
         if self.no_obsolete:
-            args = ["msgattrib"] + self.msgattrib_options + ["-o", pofile, pofile]
+            args = ["msgattrib", *self.msgattrib_options, "-o", pofile, pofile]
             msgs, errors, status = popen_wrapper(args)
             if errors:
                 if status != STATUS_OK:

diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py
@@ -11,15 +11,21 @@
 
 FieldInfo = namedtuple(
     "FieldInfo",
-    BaseFieldInfo._fields
-    + ("extra", "is_unsigned", "has_json_constraint", "comment", "data_type"),
+    [
+        *BaseFieldInfo._fields,
+        "extra",
+        "is_unsigned",
+        "has_json_constraint",
+        "comment",
+        "data_type",
+    ],
 )
 InfoLine = namedtuple(
     "InfoLine",
     "col_name data_type max_len num_prec num_scale extra column_default "
     "collation is_unsigned comment",
 )
-TableInfo = namedtuple("TableInfo", BaseTableInfo._fields + ("comment",))
+TableInfo = namedtuple("TableInfo", [*BaseTableInfo._fields, "comment"])
 
 
 class DatabaseIntrospection(BaseDatabaseIntrospection):

diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py
@@ -8,9 +8,9 @@
 from django.db.backends.base.introspection import TableInfo as BaseTableInfo
 
 FieldInfo = namedtuple(
-    "FieldInfo", BaseFieldInfo._fields + ("is_autofield", "is_json", "comment")
+    "FieldInfo", [*BaseFieldInfo._fields, "is_autofield", "is_json", "comment"]
 )
-TableInfo = namedtuple("TableInfo", BaseTableInfo._fields + ("comment",))
+TableInfo = namedtuple("TableInfo", [*BaseTableInfo._fields, "comment"])
 
 
 class DatabaseIntrospection(BaseDatabaseIntrospection):

diff --git a/django/db/backends/postgresql/introspection.py b/django/db/backends/postgresql/introspection.py
@@ -5,8 +5,8 @@
 from django.db.backends.base.introspection import TableInfo as BaseTableInfo
 from django.db.models import Index
 
-FieldInfo = namedtuple("FieldInfo", BaseFieldInfo._fields + ("is_autofield", "comment"))
-TableInfo = namedtuple("TableInfo", BaseTableInfo._fields + ("comment",))
+FieldInfo = namedtuple("FieldInfo", [*BaseFieldInfo._fields, "is_autofield", "comment"])
+TableInfo = namedtuple("TableInfo", [*BaseTableInfo._fields, "comment"])
 
 
 class DatabaseIntrospection(BaseDatabaseIntrospection):

diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py
@@ -10,7 +10,7 @@
 from django.utils.regex_helper import _lazy_re_compile
 
 FieldInfo = namedtuple(
-    "FieldInfo", BaseFieldInfo._fields + ("pk", "has_json_constraint")
+    "FieldInfo", [*BaseFieldInfo._fields, "pk", "has_json_constraint"]
 )
 
 field_size_re = _lazy_re_compile(r"^\s*(?:var)?char\s*\(\s*(\d+)\s*\)\s*$")

diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py
@@ -375,7 +375,7 @@ def combine_expression(self, connector, sub_expressions):
     def combine_duration_expression(self, connector, sub_expressions):
         if connector not in ["+", "-", "*", "/"]:
             raise DatabaseError("Invalid connector for timedelta: %s." % connector)
-        fn_params = ["'%s'" % connector] + sub_expressions
+        fn_params = ["'%s'" % connector, *sub_expressions]
         if len(fn_params) > 3:
             raise ValueError("Too many params for timedelta operations.")
         return "django_format_dtdelta(%s)" % ", ".join(fn_params)

diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
@@ -1233,7 +1233,7 @@ def generate_altered_fields(self):
                 # Handle ForeignKey which can only have a single to_field.
                 remote_field_name = getattr(new_field.remote_field, "field_name", None)
                 if remote_field_name:
-                    to_field_rename_key = rename_key + (remote_field_name,)
+                    to_field_rename_key = (*rename_key, remote_field_name)
                     if to_field_rename_key in self.renamed_fields:
                         # Repoint both model and field name because to_field
                         # inclusion in ForeignKey.deconstruct() is based on
@@ -1249,14 +1249,14 @@ def generate_altered_fields(self):
                     new_field.from_fields = tuple(
                         [
                             self.renamed_fields.get(
-                                from_rename_key + (from_field,), from_field
+                                (*from_rename_key, from_field), from_field
                             )
                             for from_field in from_fields
                         ]
                     )
                     new_field.to_fields = tuple(
                         [
-                            self.renamed_fields.get(rename_key + (to_field,), to_field)
+                            self.renamed_fields.get((*rename_key, to_field), to_field)
                             for to_field in new_field.to_fields
                         ]
                     )

diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py
@@ -231,7 +231,7 @@ def reduce(self, operation, app_label):
                 return [
                     replace(
                         self,
-                        fields=self.fields + [(operation.name, operation.field)],
+                        fields=[*self.fields, (operation.name, operation.field)],
                     ),
                 ]
             elif isinstance(operation, AlterField):

diff --git a/django/db/models/aggregates.py b/django/db/models/aggregates.py
@@ -108,7 +108,7 @@ def get_source_fields(self):
 
     def get_source_expressions(self):
         source_expressions = super().get_source_expressions()
-        return source_expressions + [self.filter, self.order_by]
+        return [*source_expressions, self.filter, self.order_by]
 
     def set_source_expressions(self, exprs):
         *exprs, self.filter, self.order_by = exprs

diff --git a/django/db/models/base.py b/django/db/models/base.py
@@ -250,7 +250,7 @@ def __new__(cls, name, bases, attrs, **kwargs):
 
         # Collect the parent links for multi-table inheritance.
         parent_links = {}
-        for base in reversed([new_class] + parents):
+        for base in reversed([new_class, *parents]):
             # Conceptually equivalent to `if base is Model`.
             if not hasattr(base, "_meta"):
                 continue

diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py
@@ -101,7 +101,7 @@ def _check_references(self, model, references):
                 errors.append(
                     checks.Error(
                         "'constraints' refers to the joined field '%s'."
-                        % LOOKUP_SEP.join([field_name] + lookups),
+                        % LOOKUP_SEP.join([field_name, *lookups]),
                         obj=model,
                         id="models.E041",
                     )

diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
@@ -1686,7 +1686,7 @@ def __repr__(self):
         return "<%s: %s>" % (self.__class__.__name__, self)
 
     def get_source_expressions(self):
-        return self.cases + [self.default]
+        return [*self.cases, self.default]
 
     def set_source_expressions(self, exprs):
         *self.cases, self.default = exprs

diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
@@ -1788,8 +1788,9 @@ def _check_decimal_places_and_max_digits(self, **kwargs):
 
     @cached_property
     def validators(self):
-        return super().validators + [
-            validators.DecimalValidator(self.max_digits, self.decimal_places)
+        return [
+            *super().validators,
+            validators.DecimalValidator(self.max_digits, self.decimal_places),
         ]
 
     @cached_property