[5.2.x] Applied Black's 2025 stable style.

https://github.com/psf/black/releases/tag/25.1.0
Backport of ff3aaf036f0cb66cd8f404cd51c603e68aaa7676 from main

.pre-commit-config.yaml

@@ -1,15 +1,15 @@
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
     - id: black
       exclude: \.py-tpl$
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.19.0
+    rev: 1.19.1
     hooks:
       - id: blacken-docs
         additional_dependencies:
-        - black==24.10.0
+        - black==25.1.0
         files: 'docs/.*\.txt$'
         args: ["--rst-literal-block"]
   - repo: https://github.com/PyCQA/isort

django/contrib/gis/db/backends/oracle/models.py

@@ -14,6 +14,7 @@ from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin
 
 class OracleGeometryColumns(models.Model):
     "Maps to the Oracle USER_SDO_GEOM_METADATA table."
+
     table_name = models.CharField(max_length=32)
     column_name = models.CharField(max_length=1024)
     srid = models.IntegerField(primary_key=True)
@@ -46,6 +47,7 @@ class OracleGeometryColumns(models.Model):
 
 class OracleSpatialRefSys(models.Model, SpatialRefSysMixin):
     "Maps to the Oracle MDSYS.CS_SRS table."
+
     cs_name = models.CharField(max_length=68)
     srid = models.IntegerField(primary_key=True)
     auth_srid = models.IntegerField()

django/contrib/gis/gdal/datasource.py

@@ -50,6 +50,7 @@ from django.utils.encoding import force_bytes, force_str
 # The OGR_DS_* routines are relevant here.
 class DataSource(GDALBase):
     "Wraps an OGR Data Source object."
+
     destructor = capi.destroy_ds
 
     def __init__(self, ds_input, ds_driver=False, write=False, encoding="utf-8"):

django/contrib/gis/gdal/envelope.py

@@ -21,6 +21,7 @@ from django.contrib.gis.gdal.error import GDALException
 #   https://gdal.org/doxygen/ogr__core_8h_source.html
 class OGREnvelope(Structure):
     "Represent the OGREnvelope C Structure."
+
     _fields_ = [
         ("MinX", c_double),
         ("MaxX", c_double),

django/contrib/gis/gdal/srs.py

@@ -345,6 +345,7 @@ class SpatialReference(GDALBase):
 
 class CoordTransform(GDALBase):
     "The coordinate system transformation object."
+
     destructor = capi.destroy_ct
 
     def __init__(self, source, target):

django/contrib/gis/geos/error.py

@@ -1,3 +1,4 @@
 class GEOSException(Exception):
     "The base GEOS exception, indicates a GEOS-related error."
+
     pass

django/contrib/gis/geos/prototypes/coordseq.py

@@ -23,6 +23,7 @@ def check_cs_get(result, func, cargs):
 # ## Coordinate sequence prototype factory classes. ##
 class CsInt(GEOSFuncFactory):
     "For coordinate sequence routines that return an integer."
+
     argtypes = [CS_PTR, POINTER(c_uint)]
     restype = c_int
     errcheck = staticmethod(check_cs_get)
@@ -30,6 +31,7 @@ class CsInt(GEOSFuncFactory):
 
 class CsOperation(GEOSFuncFactory):
     "For coordinate sequence operations."
+
     restype = c_int
 
     def __init__(self, *args, ordinate=False, get=False, **kwargs):

django/contrib/gis/geos/prototypes/geom.py

@@ -25,12 +25,14 @@ class geos_char_p(c_char_p):
 # ### ctypes factory classes ###
 class GeomOutput(GEOSFuncFactory):
     "For GEOS routines that return a geometry."
+
     restype = GEOM_PTR
     errcheck = staticmethod(check_geom)
 
 
 class IntFromGeom(GEOSFuncFactory):
     "Argument is a geometry, return type is an integer."
+
     argtypes = [GEOM_PTR]
     restype = c_int
     errcheck = staticmethod(check_minus_one)
@@ -38,6 +40,7 @@ class IntFromGeom(GEOSFuncFactory):
 
 class StringFromGeom(GEOSFuncFactory):
     "Argument is a Geometry, return type is a string."
+
     argtypes = [GEOM_PTR]
     restype = geos_char_p
     errcheck = staticmethod(check_string)

django/contrib/gis/geos/prototypes/predicates.py

@@ -12,6 +12,7 @@ from django.contrib.gis.geos.prototypes.errcheck import check_predicate
 # ## Binary & unary predicate factories ##
 class UnaryPredicate(GEOSFuncFactory):
     "For GEOS unary predicate functions."
+
     argtypes = [GEOM_PTR]
     restype = c_byte
     errcheck = staticmethod(check_predicate)
@@ -19,6 +20,7 @@ class UnaryPredicate(GEOSFuncFactory):
 
 class BinaryPredicate(UnaryPredicate):
     "For GEOS binary predicate functions."
+
     argtypes = [GEOM_PTR, GEOM_PTR]
 
 

django/contrib/gis/geos/prototypes/topology.py

@@ -16,6 +16,7 @@ from django.contrib.gis.geos.prototypes.geom import geos_char_p
 
 class Topology(GEOSFuncFactory):
     "For GEOS unary topology functions."
+
     argtypes = [GEOM_PTR]
     restype = GEOM_PTR
     errcheck = staticmethod(check_geom)

django/core/cache/backends/base.py

@@ -1,4 +1,5 @@
 "Base Cache class."
+
 import time
 import warnings
 

django/core/cache/backends/db.py

@@ -1,4 +1,5 @@
 "Database cache backend."
+
 import base64
 import pickle
 from datetime import datetime, timezone

django/core/cache/backends/filebased.py

@@ -1,4 +1,5 @@
 "File-based cache backend"
+
 import glob
 import os
 import pickle

django/core/cache/backends/locmem.py

@@ -1,4 +1,5 @@
 "Thread-safe in-memory cache backend."
+
 import pickle
 import time
 from collections import OrderedDict

django/forms/forms.py

@@ -431,6 +431,7 @@ class BaseForm(RenderableFormMixin):
 
 class Form(BaseForm, metaclass=DeclarativeFieldsMetaclass):
     "A collection of Fields, plus their associated data."
+
     # This is a separate class from BaseForm in order to abstract the way
     # self.fields is specified. This class (Form) is the one that does the
     # fancy metaclass stuff purely for the semantic sugar -- it allows one

django/template/context.py

@@ -7,6 +7,7 @@ _builtin_context_processors = ("django.template.context_processors.csrf",)
 
 class ContextPopException(Exception):
     "pop() has been called more times than push()"
+
     pass
 
 

tests/admin_views/models.py

@@ -546,6 +546,7 @@ class SuperVillain(Villain):
 
 class FunkyTag(models.Model):
     "Because we all know there's only one real use case for GFKs."
+
     name = models.CharField(max_length=25)
     content_type = models.ForeignKey(ContentType, models.CASCADE)
     object_id = models.PositiveIntegerField()

tests/admin_views/tests.py

@@ -7159,7 +7159,7 @@ class ReadonlyTest(AdminFieldExtractionMixin, TestCase):
         url = reverse("admin:admin_views_pizza_change", args=(pizza.pk,))
         with self.settings(LANGUAGE_CODE="fr"):
             response = self.client.get(url)
-        self.assertContains(response, "<label>Toppings\u00A0:</label>", html=True)
+        self.assertContains(response, "<label>Toppings\u00a0:</label>", html=True)
 
 
 @override_settings(ROOT_URLCONF="admin_views.urls")

tests/auth_tests/test_validators.py

@@ -350,10 +350,10 @@ class UsernameValidatorsTests(SimpleTestCase):
         invalid_usernames = [
             "o'connell",
             "عبد ال",
-            "zerowidth\u200Bspace",
-            "nonbreaking\u00A0space",
+            "zerowidth\u200bspace",
+            "nonbreaking\u00a0space",
             "en\u2013dash",
-            "trailingnewline\u000A",
+            "trailingnewline\u000a",
         ]
         v = validators.UnicodeUsernameValidator()
         for valid in valid_usernames:

tests/backends/tests.py

@@ -90,7 +90,7 @@ class LastExecutedQueryTest(TestCase):
 
     def test_query_encoding(self):
         """last_executed_query() returns a string."""
-        data = RawData.objects.filter(raw_data=b"\x00\x46  \xFE").extra(
+        data = RawData.objects.filter(raw_data=b"\x00\x46  \xfe").extra(
             select={"föö": 1}
         )
         sql, params = data.query.sql_with_params()

tests/forms_tests/tests/test_utils.py

@@ -73,7 +73,7 @@ class FormsUtilsTestCase(SimpleTestCase):
         )
         # Can take a Unicode string.
         self.assertHTMLEqual(
-            str(ErrorList(ValidationError("Not \u03C0.").messages)),
+            str(ErrorList(ValidationError("Not \u03c0.").messages)),
             '<ul class="errorlist"><li>Not π.</li></ul>',
         )
         # Can take a lazy string.
@@ -107,7 +107,7 @@ class FormsUtilsTestCase(SimpleTestCase):
                         ValidationError(
                             [
                                 "1. First error.",
-                                "2. Not \u03C0.",
+                                "2. Not \u03c0.",
                                 gettext_lazy("3. Error."),
                                 {
                                     "error_1": "4. First dict error.",

tests/gis_tests/distapp/models.py

@@ -15,17 +15,20 @@ class NamedModel(models.Model):
 
 class SouthTexasCity(NamedModel):
     "City model on projected coordinate system for South Texas."
+
     point = models.PointField(srid=32140)
     radius = models.IntegerField(default=10000)
 
 
 class SouthTexasCityFt(NamedModel):
     "Same City model as above, but U.S. survey feet are the units."
+
     point = models.PointField(srid=2278)
 
 
 class AustraliaCity(NamedModel):
     "City model for Australia, using WGS84."
+
     point = models.PointField()
     radius = models.IntegerField(default=10000)
     allowed_distance = models.FloatField(default=0.5)
@@ -34,19 +37,23 @@ class AustraliaCity(NamedModel):
 
 class CensusZipcode(NamedModel):
     "Model for a few South Texas ZIP codes (in original Census NAD83)."
+
     poly = models.PolygonField(srid=4269)
 
 
 class SouthTexasZipcode(NamedModel):
     "Model for a few South Texas ZIP codes."
+
     poly = models.PolygonField(srid=32140, null=gisfield_may_be_null)
 
 
 class Interstate(NamedModel):
     "Geodetic model for U.S. Interstates."
+
     path = models.LineStringField()
 
 
 class SouthTexasInterstate(NamedModel):
     "Projected model for South Texas Interstates."
+
     path = models.LineStringField(srid=32140)

tests/model_fields/test_binaryfield.py

@@ -6,7 +6,7 @@ from .models import DataModel
 
 
 class BinaryFieldTests(TestCase):
-    binary_data = b"\x00\x46\xFE"
+    binary_data = b"\x00\x46\xfe"
 
     def test_set_and_retrieve(self):
         data_set = (

tests/postgres_tests/test_constraints.py

@@ -309,7 +309,7 @@ class ExclusionConstraintTests(PostgreSQLTestCase):
 
     def test_invalid_expressions(self):
         msg = "The expressions must be a list of 2-tuples."
-        for expressions in (["foo"], [("foo")], [("foo_1", "foo_2", "foo_3")]):
+        for expressions in (["foo"], ["foo"], [("foo_1", "foo_2", "foo_3")]):
             with self.subTest(expressions), self.assertRaisesMessage(ValueError, msg):
                 ExclusionConstraint(
                     index_type="GIST",

tests/serializers/test_data.py

@@ -257,7 +257,7 @@ uuid_obj = uuid.uuid4()
 
 test_data = [
     # Format: (test helper, PK value, Model Class, data)
-    (data_obj, 1, BinaryData, memoryview(b"\x05\xFD\x00")),
+    (data_obj, 1, BinaryData, memoryview(b"\x05\xfd\x00")),
     (data_obj, 5, BooleanData, True),
     (data_obj, 6, BooleanData, False),
     (data_obj, 7, BooleanData, None),

tests/serializers/test_xml.py

@@ -70,7 +70,7 @@ class XmlSerializerTestCase(SerializersTestBase, TestCase):
         msg = "Article.headline (pk:%s) contains unserializable characters" % self.a1.pk
         with self.assertRaisesMessage(ValueError, msg):
             serializers.serialize(self.serializer_name, [self.a1])
-        self.a1.headline = "HT \u0009, LF \u000A, and CR \u000D are allowed"
+        self.a1.headline = "HT \u0009, LF \u000a, and CR \u000d are allowed"
         self.assertIn(
             "HT \t, LF \n, and CR \r are allowed",
             serializers.serialize(self.serializer_name, [self.a1]),

tests/utils_tests/test_text.py

@@ -9,7 +9,7 @@ from django.utils.functional import lazystr
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy, override
 
-IS_WIDE_BUILD = len("\U0001F4A9") == 1
+IS_WIDE_BUILD = len("\U0001f4a9") == 1
 
 
 class TestUtilsText(SimpleTestCase):
@@ -76,16 +76,16 @@ class TestUtilsText(SimpleTestCase):
         # Ensure the final length is calculated correctly when there are
         # combining characters with no precomposed form, and that combining
         # characters are not split up.
-        truncator = text.Truncator("-B\u030AB\u030A----8")
-        self.assertEqual("-B\u030A…", truncator.chars(3))
-        self.assertEqual("-B\u030AB\u030A-…", truncator.chars(5))
-        self.assertEqual("-B\u030AB\u030A----8", truncator.chars(8))
+        truncator = text.Truncator("-B\u030aB\u030a----8")
+        self.assertEqual("-B\u030a…", truncator.chars(3))
+        self.assertEqual("-B\u030aB\u030a-…", truncator.chars(5))
+        self.assertEqual("-B\u030aB\u030a----8", truncator.chars(8))
 
         # Ensure the length of the end text is correctly calculated when it
         # contains combining characters with no precomposed form.
         truncator = text.Truncator("-----")
-        self.assertEqual("---B\u030A", truncator.chars(4, "B\u030A"))
-        self.assertEqual("-----", truncator.chars(5, "B\u030A"))
+        self.assertEqual("---B\u030a", truncator.chars(4, "B\u030a"))
+        self.assertEqual("-----", truncator.chars(5, "B\u030a"))
 
         # Make a best effort to shorten to the desired length, but requesting
         # a length shorter than the ellipsis shouldn't break