Fix missing at runtime errors (batch 3) (#2639)

* Handle os specific stubs

* Fix some const names

* Remove `as_subquery_condition`

* Remove `deferred_to_columns`

* Fix `ConnectionHandler` types

* Remove `_get_flatchoices`

* Remove `check_supported`

* Move outbox allowlist entry

Author: UnknownPlatypus

django-stubs/contrib/gis/gdal/raster/const.pyi

@@ -1,8 +1,9 @@
 GDAL_PIXEL_TYPES: dict[int, str]
 GDAL_INTEGER_TYPES: list[int]
-GDAL_TO_CTYPES: type
+GDAL_TO_CTYPES: list[type | None]
 GDAL_RESAMPLE_ALGORITHMS: dict[str, int]
 GDAL_COLOR_TYPES: dict[int, str]
-VSI_FILESYSTEM_BASE_PATH: str
+VSI_FILESYSTEM_PREFIX: str
+VSI_MEM_FILESYSTEM_BASE_PATH: str
 VSI_TAKE_BUFFER_OWNERSHIP: bool
 VSI_DELETE_BUFFER_ON_READ: bool

django-stubs/contrib/postgres/constraints.pyi

@@ -1,6 +1,5 @@
 from collections.abc import Iterable, Sequence
 
-from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.models import Deferrable
 from django.db.models.base import Model
 from django.db.models.constraints import BaseConstraint
@@ -28,7 +27,6 @@ class ExclusionConstraint(BaseConstraint):
         violation_error_code: str | None = None,
         violation_error_message: _StrOrPromise | None = None,
     ) -> None: ...
-    def check_supported(self, schema_editor: BaseDatabaseSchemaEditor) -> None: ...
     def validate(
         self, model: type[Model], instance: Model, exclude: Iterable[str] | None = None, using: str = "default"
     ) -> None: ...

django-stubs/core/files/locks.pyi

@@ -1,15 +1,17 @@
+import sys
 from ctypes import Structure, Union
 from typing import Any
 
 LOCK_SH: int
 LOCK_NB: int
 LOCK_EX: int
-ULONG_PTR: Any
-PVOID: Any
 
-class _OFFSET(Structure): ...
-class _OFFSET_UNION(Union): ...
-class OVERLAPPED(Structure): ...
+if sys.platform == "win32":
+    ULONG_PTR: Any
+    PVOID: Any
+    class _OFFSET(Structure): ...
+    class _OFFSET_UNION(Union): ...
+    class OVERLAPPED(Structure): ...
 
 def lock(f: Any, flags: int) -> bool: ...
 def unlock(f: Any) -> bool: ...

django-stubs/db/backends/mysql/compiler.pyi

@@ -1,11 +1,7 @@
-from typing import Any
-
 from django.db.models.sql import compiler
 from django.db.models.sql.compiler import _AsSqlType
 
-class SQLCompiler(compiler.SQLCompiler):
-    def as_subquery_condition(self, alias: Any, columns: Any, compiler: Any) -> _AsSqlType: ...
-
+class SQLCompiler(compiler.SQLCompiler): ...
 class SQLInsertCompiler(compiler.SQLInsertCompiler, SQLCompiler): ...
 
 class SQLDeleteCompiler(compiler.SQLDeleteCompiler, SQLCompiler):

django-stubs/db/migrations/graph.pyi

@@ -4,8 +4,6 @@ from typing import Any
 from django.db.migrations.migration import Migration
 from django.db.migrations.state import ProjectState
 
-RECURSION_DEPTH_WARNING: str
-
 class Node:
     key: tuple[str, str]
     children: set[Any]

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

@@ -224,7 +224,6 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
         limit_choices_to: _LimitChoicesTo | None = None,
         ordering: Sequence[str] = (),
     ) -> BlankChoiceIterator | _ChoicesList: ...
-    def _get_flatchoices(self) -> list[_Choice]: ...
     @property
     def flatchoices(self) -> list[_Choice]: ...
     def has_default(self) -> bool: ...

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

@@ -87,7 +87,6 @@ class SQLCompiler:
         restricted: bool | None = None,
     ) -> list[dict[str, Any]]: ...
     def get_select_for_update_of_arguments(self) -> list[Any]: ...
-    def deferred_to_columns(self) -> dict[type[Model], set[str]]: ...
     def get_converters(self, expressions: list[Expression]) -> dict[int, tuple[list[Callable], Expression]]: ...
     def apply_converters(
         self, rows: Iterable[Iterable[Any]], converters: dict[int, tuple[list[Callable], Expression]]
@@ -119,7 +118,6 @@ class SQLCompiler:
     def execute_sql(
         self, result_type: Literal["multi"] = "multi", chunked_fetch: bool = False, chunk_size: int = 100
     ) -> Iterable[list[Sequence[Any]]] | None: ...
-    def as_subquery_condition(self, alias: str, columns: list[str], compiler: SQLCompiler) -> _AsSqlType: ...
     def explain_query(self) -> Iterator[str]: ...
 
 class SQLInsertCompiler(SQLCompiler):

django-stubs/db/utils.pyi

@@ -34,10 +34,9 @@ class DatabaseErrorWrapper:
 def load_backend(backend_name: str) -> Any: ...
 
 class ConnectionHandler(BaseConnectionHandler[BaseDatabaseWrapper]):
+    def configure_settings(self, databases: dict[str, Any] | None) -> dict[str, Any]: ...
     @property
     def databases(self) -> dict[str, dict[str, Any]]: ...
-    def ensure_defaults(self, alias: str) -> None: ...
-    def prepare_test_settings(self, alias: str) -> None: ...
     def create_connection(self, alias: str) -> BaseDatabaseWrapper: ...
     def close_all(self) -> None: ...
 

scripts/stubtest/allowlist.txt

@@ -547,3 +547,6 @@ django.forms.models.BaseModelForm.save_m2m
 django.forms.models.BaseModelFormSet.save_m2m
 django.contrib.gis.forms.BaseModelForm.save_m2m
 django.contrib.gis.forms.BaseModelFormSet.save_m2m
+
+# Dynamically generated in https://github.com/django/django/blame/0ee06c04e0256094270db3ffe8b5dafa6a8457a3/django/core/mail/backends/locmem.py#L24
+django.core.mail.outbox

scripts/stubtest/allowlist_todo.txt

@@ -374,10 +374,6 @@ django.contrib.gis.gdal.envelope.OGREnvelope.MinY
 django.contrib.gis.gdal.geometries.LineString.coords
 django.contrib.gis.gdal.geometries.OGRGeometry.geojson
 django.contrib.gis.gdal.geometries.Polygon.exterior_ring
-django.contrib.gis.gdal.raster.const.GDAL_TO_CTYPES
-django.contrib.gis.gdal.raster.const.VSI_FILESYSTEM_BASE_PATH
-django.contrib.gis.gdal.raster.const.VSI_FILESYSTEM_PREFIX
-django.contrib.gis.gdal.raster.const.VSI_MEM_FILESYSTEM_BASE_PATH
 django.contrib.gis.gdal.srs.SpatialReference.pretty_wkt
 django.contrib.gis.gdal.srs.SpatialReference.xml
 django.contrib.gis.geos.Point.tuple
@@ -434,9 +430,6 @@ django.contrib.staticfiles.finders.BaseStorageFinder.storage
 django.contrib.staticfiles.finders.DefaultStorageFinder.storage
 django.contrib.staticfiles.storage.staticfiles_storage
 django.core.cache.cache
-django.core.files.locks.OVERLAPPED
-django.core.files.locks.PVOID
-django.core.files.locks.ULONG_PTR
 django.core.files.uploadedfile.UploadedFile.size
 django.core.files.utils.FileProxyMixin.encoding
 django.core.files.utils.FileProxyMixin.fileno
@@ -461,7 +454,6 @@ django.core.mail.backends.locmem.EmailBackend.send_messages
 django.core.mail.backends.smtp.EmailBackend.__init__
 django.core.mail.backends.smtp.EmailBackend.connection_class
 django.core.mail.backends.smtp.EmailBackend.ssl_context
-django.core.mail.outbox
 django.core.management.commands.makemessages.TranslatableFile.__ge__
 django.core.management.commands.makemessages.TranslatableFile.__gt__
 django.core.management.commands.makemessages.TranslatableFile.__le__
@@ -528,7 +520,6 @@ django.db.migrations.Migration.suggest_name
 django.db.migrations.graph.Node.__ge__
 django.db.migrations.graph.Node.__gt__
 django.db.migrations.graph.Node.__le__
-django.db.migrations.graph.RECURSION_DEPTH_WARNING
 django.db.migrations.loader.MigrationLoader.collect_sql
 django.db.migrations.migration.Migration.suggest_name
 django.db.migrations.operations.utils
@@ -955,7 +946,6 @@ django.db.models.query_utils.select_related_descend
 django.db.models.sql.AggregateQuery.__init__
 django.db.models.sql.InsertQuery.__init__
 django.db.models.sql.compiler.SQLCompiler.__init__
-django.db.models.sql.compiler.SQLCompiler.deferred_to_columns
 django.db.models.sql.compiler.SQLCompiler.get_default_columns
 django.db.models.sql.compiler.SQLCompiler.get_qualify_sql
 django.db.models.sql.compiler.SQLCompiler.get_related_selections
@@ -975,9 +965,6 @@ django.db.models.sql.where.WhereNode.replace_expressions
 django.db.models.sql.where.WhereNode.set_source_expressions
 django.db.models.sql.where.WhereNode.split_having
 django.db.models.sql.where.WhereNode.split_having_qualify
-django.db.utils.ConnectionHandler.configure_settings
-django.db.utils.ConnectionHandler.ensure_defaults
-django.db.utils.ConnectionHandler.prepare_test_settings
 django.db.utils.DatabaseErrorWrapper.__call__
 django.forms.ALL_FIELDS
 django.forms.BaseForm.__init__