Fix some django52 (typeddjango#2691)

Co-authored-by: sobolevn <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

django-stubs/db/models/fields/composite.pyi

@@ -60,3 +60,5 @@ class CompositePrimaryKey(Field):
     def __iter__(self) -> Iterator[Field | ForeignObjectRel | GenericForeignKey]: ...
     def __len__(self) -> int: ...
     def get_pk_value_on_save(self, instance: Model) -> tuple: ...  # actual type is tuple of field.value_from_object
+
+def unnest(fields: Iterable[Field[Any, Any]]) -> list[Field[Any, Any]]: ...

django-stubs/db/models/options.pyi

@@ -143,3 +143,7 @@ class Options(Generic[_M]):
     def total_unique_constraints(self) -> list[UniqueConstraint]: ...
     @cached_property
     def db_returning_fields(self) -> list[Field[Any, Any]]: ...
+    @cached_property
+    def pk_fields(self) -> list[Field[Any, Any]]: ...
+    @property
+    def is_composite_pk(self) -> bool: ...

django-stubs/db/models/sql/compiler.pyi

@@ -6,6 +6,7 @@ from uuid import UUID
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.backends.utils import CursorWrapper
+from django.db.models import Field
 from django.db.models.base import Model
 from django.db.models.expressions import BaseExpression, Expression, Ref
 from django.db.models.sql.query import Query
@@ -120,12 +121,21 @@ class SQLCompiler:
         self, result_type: Literal["multi"] = "multi", chunked_fetch: bool = False, chunk_size: int = 100
     ) -> Iterable[list[Sequence[Any]]] | None: ...
     def explain_query(self) -> Iterator[str]: ...
+    def composite_fields_to_tuples(
+        self, rows: Iterable[Any], expressions: Iterable[Expression]
+    ) -> Iterator[list[tuple[Any, ...]]]: ...
+    def has_composite_fields(self, expressions: Iterable[Expression]) -> bool: ...
 
 class SQLInsertCompiler(SQLCompiler):
     query: InsertQuery
     returning_fields: Sequence[Any] | None
     returning_params: Sequence[Any]
-    def field_as_sql(self, field: Any, val: Any) -> _AsSqlType: ...
+    def field_as_sql(
+        self,
+        field: Field[Any, Any] | None,
+        get_placeholder: Callable[[Any, SQLInsertCompiler, BaseDatabaseWrapper], str],
+        val: Any,
+    ) -> _AsSqlType: ...
     def prepare_value(self, field: Any, value: Any) -> Any: ...
     def pre_save_val(self, field: Any, obj: Any) -> Any: ...
     def assemble_as_sql(self, fields: Any, value_rows: Any) -> tuple[list[list[str]], list[list[Any]]]: ...

django-stubs/forms/boundfield.pyi

@@ -69,6 +69,8 @@ class BoundField(RenderableFieldMixin):
     def widget_type(self) -> str: ...
     @property
     def use_fieldset(self) -> bool: ...
+    @property
+    def aria_describedby(self) -> str | None: ...
 
 class BoundWidget:
     parent_widget: Widget

django-stubs/forms/forms.pyi

@@ -32,6 +32,7 @@ class BaseForm(RenderableFormMixin):
     template_name_table: str
     template_name_ul: str
     template_name_label: str
+    bound_field_class: type[BoundField] | None
     def __init__(
         self,
         data: _DataT | None = None,

django-stubs/forms/renderers.pyi

@@ -1,5 +1,6 @@
 from typing import Any
 
+from django.forms.boundfield import BoundField
 from django.http import HttpRequest
 from django.template.backends.base import BaseEngine
 from django.template.backends.django import DjangoTemplates as DjangoTemplatesR
@@ -14,6 +15,7 @@ class BaseRenderer:
     form_template_name: str
     formset_template_name: str
     field_template_name: str
+    bound_field_class: type[BoundField] | None
     def get_template(self, template_name: str) -> Any: ...
     def render(self, template_name: str, context: dict[str, Any], request: HttpRequest | None = None) -> str: ...
 

django-stubs/test/runner.pyi

@@ -88,6 +88,7 @@ class ParallelTestSuite(TestSuite):
         self, subsuites: list[TestSuite], processes: int, failfast: bool = ..., buffer: bool = ...
     ) -> None: ...
     def run(self, result: Any) -> Any: ...  # type: ignore[override]
+    def handle_event(self, result: Any, tests: list[TestSuite], event: Sequence[Any]) -> None: ...
 
 class DiscoverRunner:
     test_suite: type[TestSuite]

scripts/stubtest/allowlist.txt

@@ -444,6 +444,7 @@ django.db.models.CompositePrimaryKey.fields
 django.db.models.fields.composite.CompositePrimaryKey.cached_col
 django.db.models.fields.composite.CompositePrimaryKey.columns
 django.db.models.fields.composite.CompositePrimaryKey.fields
+django.db.models.options.Options.pk_fields
 
 # Ignore missing inner `Meta` class, see PR #2000 for the related discussion
 django.contrib.auth.base_user.AbstractBaseUser.Meta

scripts/stubtest/allowlist_todo_django52.txt

@@ -12,8 +12,6 @@ django.contrib.gis.db.models.Field.has_db_default
 django.contrib.gis.db.models.ForeignKey.cast_db_type
 django.contrib.gis.db.models.OrderBy.allows_composite_expressions
 django.contrib.gis.db.models.Q.identity
-django.contrib.gis.forms.BaseForm.bound_field_class
-django.contrib.gis.forms.BoundField.aria_describedby
 django.contrib.gis.gdal.OGRGeometry.geos_support
 django.contrib.gis.gdal.OGRGeometry.get_curve_geometry
 django.contrib.gis.gdal.OGRGeometry.get_linear_geometry
@@ -45,12 +43,9 @@ django.db.backends.base.features.BaseDatabaseFeatures.rounds_to_even
 django.db.backends.base.features.BaseDatabaseFeatures.supports_tuple_lookups
 django.db.backends.base.schema.BaseDatabaseSchemaEditor.sql_pk_constraint
 django.db.backends.mysql.compiler.SQLCompiler.__init__
-django.db.backends.mysql.compiler.SQLCompiler.composite_fields_to_tuples
 django.db.backends.mysql.compiler.SQLCompiler.get_default_columns
 django.db.backends.mysql.compiler.SQLCompiler.get_qualify_sql
 django.db.backends.mysql.compiler.SQLCompiler.get_related_selections
-django.db.backends.mysql.compiler.SQLCompiler.has_composite_fields
-django.db.backends.mysql.compiler.SQLInsertCompiler.field_as_sql
 django.db.backends.mysql.features.DatabaseFeatures.allows_group_by_selected_pks
 django.db.backends.mysql.features.DatabaseFeatures.has_native_uuid_field
 django.db.backends.mysql.features.DatabaseFeatures.supports_expression_defaults
@@ -97,19 +92,7 @@ django.db.models.expressions.ColPairs
 django.db.models.expressions.OrderBy.allows_composite_expressions
 django.db.models.expressions.OutputFieldIsNoneError
 django.db.models.fields.Field.has_db_default
-django.db.models.fields.composite.unnest
 django.db.models.fields.related.ForeignKey.cast_db_type
 django.db.models.fields.tuple_lookups
 django.db.models.functions.JSONObject.join
 django.db.models.functions.json.JSONObject.join
-django.db.models.options.Options.is_composite_pk
-django.db.models.options.Options.pk_fields
-django.db.models.sql.compiler.SQLCompiler.composite_fields_to_tuples
-django.db.models.sql.compiler.SQLCompiler.has_composite_fields
-django.db.models.sql.compiler.SQLInsertCompiler.field_as_sql
-django.forms.BaseForm.bound_field_class
-django.forms.BoundField.aria_describedby
-django.forms.boundfield.BoundField.aria_describedby
-django.forms.forms.BaseForm.bound_field_class
-django.forms.renderers.BaseRenderer.bound_field_class
-django.test.runner.ParallelTestSuite.handle_event