fix: Resolve pr comments

Author: FallenDeity

django-stubs/contrib/admin/models.pyi

@@ -32,6 +32,7 @@ class LogEntryManager(models.Manager[LogEntry]):
         action_flag: int,
         change_message: str | list[Any] = "",
         *,
+        # Commit 27b68bc, django https://github.com/django/django/pull/19233
         single_object: bool = False,
     ) -> list[LogEntry] | LogEntry: ...
 

django-stubs/contrib/auth/models.pyi

@@ -30,8 +30,8 @@ class Permission(models.Model):
     content_type = models.ForeignKey[ContentType | Combinable, ContentType](ContentType, on_delete=models.CASCADE)
     content_type_id: int
     codename = models.CharField(max_length=100)
-    group_set: ManyToManyDescriptor[Group, Group_permissions]
-    user_set: ManyToManyDescriptor[User, User_permissions]
+    group_set: ManyToManyDescriptor[Group, _Group_permissions]
+    user_set: ManyToManyDescriptor[User, _User_permissions]
     def natural_key(self) -> tuple[str, str, str]: ...
 
 class GroupManager(models.Manager[Group]):
@@ -40,7 +40,7 @@ class GroupManager(models.Manager[Group]):
 # This is a model that only exists in Django's model registry and doesn't have any
 # class statement form. It's the through model between 'Group' and 'Permission'.
 @type_check_only
-class Group_permissions(models.Model):
+class _Group_permissions(models.Model):
     objects: ClassVar[models.Manager[Self]]
 
     id: models.AutoField
@@ -53,7 +53,7 @@ class Group_permissions(models.Model):
 # This is a model that only exists in Django's model registry and doesn't have any
 # class statement form. It's the through model between 'User' and 'Group'.
 @type_check_only
-class User_groups(models.Model):
+class _User_groups(models.Model):
     objects: ClassVar[models.Manager[Self]]
 
     id: models.AutoField
@@ -66,7 +66,7 @@ class User_groups(models.Model):
 # This is a model that only exists in Django's model registry and doesn't have any
 # class statement form. It's the through model between 'User' and 'Permission'.
 @type_check_only
-class User_permissions(models.Model):
+class _User_permissions(models.Model):
     objects: ClassVar[models.Manager[Self]]
 
     id: models.AutoField
@@ -82,8 +82,8 @@ class Group(models.Model):
     id: models.AutoField
     pk: models.AutoField
     name = models.CharField(max_length=150)
-    permissions = models.ManyToManyField[Permission, Group_permissions](Permission)
-    user_set: ManyToManyDescriptor[User, User_groups]
+    permissions = models.ManyToManyField[Permission, _Group_permissions](Permission)
+    user_set: ManyToManyDescriptor[User, _User_groups]
     def natural_key(self) -> tuple[str]: ...
 
 _T = TypeVar("_T", bound=Model)
@@ -106,8 +106,8 @@ class UserManager(BaseUserManager[_T]):
 
 class PermissionsMixin(models.Model):
     is_superuser = models.BooleanField()
-    groups = models.ManyToManyField[Group, User_groups](Group)
-    user_permissions = models.ManyToManyField[Permission, User_permissions](Permission)
+    groups = models.ManyToManyField[Group, _User_groups](Group)
+    user_permissions = models.ManyToManyField[Permission, _User_permissions](Permission)
 
     def get_user_permissions(self, obj: _AnyUser | None = ...) -> set[str]: ...
     def get_group_permissions(self, obj: _AnyUser | None = ...) -> set[str]: ...

django-stubs/contrib/flatpages/models.pyi

@@ -8,7 +8,7 @@ from typing_extensions import Self
 # This is a model that only exists in Django's model registry and doesn't have any
 # class statement form. It's the through model between 'FlatPage' and 'Site'.
 @type_check_only
-class FlatPage_sites(models.Model):
+class _FlatPage_sites(models.Model):
     objects: ClassVar[models.Manager[Self]]
 
     id: models.AutoField
@@ -27,5 +27,5 @@ class FlatPage(models.Model):
     enable_comments: models.BooleanField
     template_name: models.CharField
     registration_required: models.BooleanField
-    sites: models.ManyToManyField[Site, FlatPage_sites]
+    sites: models.ManyToManyField[Site, _FlatPage_sites]
     def get_absolute_url(self) -> str: ...

django-stubs/contrib/gis/db/models/fields.pyi

@@ -22,51 +22,9 @@ from django.utils.functional import _StrOrPromise
 _ST = TypeVar("_ST")
 # __get__ return type
 _GT = TypeVar("_GT")
-
-_ST_PointField = TypeVar("_ST_PointField", default=Point | Combinable)
-_GT_PointField = TypeVar("_GT_PointField", default=Point)
-_Form_PointField = TypeVar("_Form_PointField", bound=forms.PointField, default=forms.PointField)
-_Geom_PointField = TypeVar("_Geom_PointField", bound=Point, default=Point)
-
-_ST_LineStringField = TypeVar("_ST_LineStringField", default=LineString | Combinable)
-_GT_LineStringField = TypeVar("_GT_LineStringField", default=LineString)
-_Form_LineStringField = TypeVar("_Form_LineStringField", bound=forms.LineStringField, default=forms.LineStringField)
-_Geom_LineStringField = TypeVar("_Geom_LineStringField", bound=LineString, default=LineString)
-
-_ST_PolygonField = TypeVar("_ST_PolygonField", default=Polygon | Combinable)
-_GT_PolygonField = TypeVar("_GT_PolygonField", default=Polygon)
-_Form_PolygonField = TypeVar("_Form_PolygonField", bound=forms.PolygonField, default=forms.PolygonField)
-_Geom_PolygonField = TypeVar("_Geom_PolygonField", bound=Polygon, default=Polygon)
-
-_ST_MultiPointField = TypeVar("_ST_MultiPointField", default=MultiPoint | Combinable)
-_GT_MultiPointField = TypeVar("_GT_MultiPointField", default=MultiPoint)
-_Form_MultiPointField = TypeVar("_Form_MultiPointField", bound=forms.MultiPointField, default=forms.MultiPointField)
-_Geom_MultiPointField = TypeVar("_Geom_MultiPointField", bound=MultiPoint, default=MultiPoint)
-
-_ST_MultiLineStringField = TypeVar("_ST_MultiLineStringField", default=MultiLineString | Combinable)
-_GT_MultiLineStringField = TypeVar("_GT_MultiLineStringField", default=MultiLineString)
-_Form_MultiLineStringField = TypeVar(
-    "_Form_MultiLineStringField", bound=forms.MultiLineStringField, default=forms.MultiLineStringField
-)
-_Geom_MultiLineStringField = TypeVar("_Geom_MultiLineStringField", bound=MultiLineString, default=MultiLineString)
-
-_ST_MultiPolygonField = TypeVar("_ST_MultiPolygonField", default=MultiPolygon | Combinable)
-_GT_MultiPolygonField = TypeVar("_GT_MultiPolygonField", default=MultiPolygon)
-_Form_MultiPolygonField = TypeVar(
-    "_Form_MultiPolygonField", bound=forms.MultiPolygonField, default=forms.MultiPolygonField
-)
-_Geom_MultiPolygonField = TypeVar("_Geom_MultiPolygonField", bound=MultiPolygon, default=MultiPolygon)
-
-_ST_GeometryCollectionField = TypeVar("_ST_GeometryCollectionField", default=GeometryCollection | Combinable)
-_GT_GeometryCollectionField = TypeVar("_GT_GeometryCollectionField", default=GeometryCollection)
-_Form_GeometryCollectionField = TypeVar(
-    "_Form_GeometryCollectionField", bound=forms.GeometryCollectionField, default=forms.GeometryCollectionField
-)
-_Geom_GeometryCollectionField = TypeVar(
-    "_Geom_GeometryCollectionField", bound=GeometryCollection, default=GeometryCollection
-)
-
+# Form class type
 _Form_ClassT = TypeVar("_Form_ClassT", bound=forms.GeometryField)
+# Geometry class type
 _GEOM_ClassT = TypeVar("_GEOM_ClassT", bound=GEOSGeometry)
 
 class SRIDCacheEntry(NamedTuple):
@@ -77,11 +35,11 @@ class SRIDCacheEntry(NamedTuple):
 
 def get_srid_info(srid: int, connection: Any) -> SRIDCacheEntry: ...
 @type_check_only
-class SpatialClassField(Generic[_Form_ClassT, _GEOM_ClassT]):
+class _SpatialClassField(Generic[_Form_ClassT, _GEOM_ClassT]):
     form_class: type[_Form_ClassT]
     geom_class: type[_GEOM_ClassT] | None
 
-class BaseSpatialField(Field[_ST, _GT], SpatialClassField[_Form_ClassT, _GEOM_ClassT]):
+class BaseSpatialField(Field[_ST, _GT], _SpatialClassField[_Form_ClassT, _GEOM_ClassT]):
     geom_type: str
     geography: bool
     spatial_index: bool
@@ -170,30 +128,57 @@ class GeometryField(BaseSpatialField[_ST, _GT, _Form_ClassT, _GEOM_ClassT]):
         **kwargs: Any,
     ) -> forms.GeometryField: ...
 
+_ST_PointField = TypeVar("_ST_PointField", default=Point | Combinable)
+_GT_PointField = TypeVar("_GT_PointField", default=Point)
+_Form_PointField = TypeVar("_Form_PointField", bound=forms.PointField, default=forms.PointField)
+_Geom_PointField = TypeVar("_Geom_PointField", bound=Point, default=Point)
+
 class PointField(GeometryField[_ST_PointField, _GT_PointField, _Form_PointField, _Geom_PointField]):
     _pyi_private_set_type: Point | Combinable
     _pyi_private_get_type: Point
     _pyi_lookup_exact_type: Point
 
+_ST_LineStringField = TypeVar("_ST_LineStringField", default=LineString | Combinable)
+_GT_LineStringField = TypeVar("_GT_LineStringField", default=LineString)
+_Form_LineStringField = TypeVar("_Form_LineStringField", bound=forms.LineStringField, default=forms.LineStringField)
+_Geom_LineStringField = TypeVar("_Geom_LineStringField", bound=LineString, default=LineString)
+
 class LineStringField(
     GeometryField[_ST_LineStringField, _GT_LineStringField, _Form_LineStringField, _Geom_LineStringField]
 ):
     _pyi_private_set_type: LineString | Combinable
     _pyi_private_get_type: LineString
     _pyi_lookup_exact_type: LineString
 
+_ST_PolygonField = TypeVar("_ST_PolygonField", default=Polygon | Combinable)
+_GT_PolygonField = TypeVar("_GT_PolygonField", default=Polygon)
+_Form_PolygonField = TypeVar("_Form_PolygonField", bound=forms.PolygonField, default=forms.PolygonField)
+_Geom_PolygonField = TypeVar("_Geom_PolygonField", bound=Polygon, default=Polygon)
+
 class PolygonField(GeometryField[_ST_PolygonField, _GT_PolygonField, _Form_PolygonField, _Geom_PolygonField]):
     _pyi_private_set_type: Polygon | Combinable
     _pyi_private_get_type: Polygon
     _pyi_lookup_exact_type: Polygon
 
+_ST_MultiPointField = TypeVar("_ST_MultiPointField", default=MultiPoint | Combinable)
+_GT_MultiPointField = TypeVar("_GT_MultiPointField", default=MultiPoint)
+_Form_MultiPointField = TypeVar("_Form_MultiPointField", bound=forms.MultiPointField, default=forms.MultiPointField)
+_Geom_MultiPointField = TypeVar("_Geom_MultiPointField", bound=MultiPoint, default=MultiPoint)
+
 class MultiPointField(
     GeometryField[_ST_MultiPointField, _GT_MultiPointField, _Form_MultiPointField, _Geom_MultiPointField]
 ):
     _pyi_private_set_type: MultiPoint | Combinable
     _pyi_private_get_type: MultiPoint
     _pyi_lookup_exact_type: MultiPoint
 
+_ST_MultiLineStringField = TypeVar("_ST_MultiLineStringField", default=MultiLineString | Combinable)
+_GT_MultiLineStringField = TypeVar("_GT_MultiLineStringField", default=MultiLineString)
+_Form_MultiLineStringField = TypeVar(
+    "_Form_MultiLineStringField", bound=forms.MultiLineStringField, default=forms.MultiLineStringField
+)
+_Geom_MultiLineStringField = TypeVar("_Geom_MultiLineStringField", bound=MultiLineString, default=MultiLineString)
+
 class MultiLineStringField(
     GeometryField[
         _ST_MultiLineStringField, _GT_MultiLineStringField, _Form_MultiLineStringField, _Geom_MultiLineStringField
@@ -203,13 +188,29 @@ class MultiLineStringField(
     _pyi_private_get_type: MultiLineString
     _pyi_lookup_exact_type: MultiLineString
 
+_ST_MultiPolygonField = TypeVar("_ST_MultiPolygonField", default=MultiPolygon | Combinable)
+_GT_MultiPolygonField = TypeVar("_GT_MultiPolygonField", default=MultiPolygon)
+_Form_MultiPolygonField = TypeVar(
+    "_Form_MultiPolygonField", bound=forms.MultiPolygonField, default=forms.MultiPolygonField
+)
+_Geom_MultiPolygonField = TypeVar("_Geom_MultiPolygonField", bound=MultiPolygon, default=MultiPolygon)
+
 class MultiPolygonField(
     GeometryField[_ST_MultiPolygonField, _GT_MultiPolygonField, _Form_MultiPolygonField, _Geom_MultiPolygonField]
 ):
     _pyi_private_set_type: MultiPolygon | Combinable
     _pyi_private_get_type: MultiPolygon
     _pyi_lookup_exact_type: MultiPolygon
 
+_ST_GeometryCollectionField = TypeVar("_ST_GeometryCollectionField", default=GeometryCollection | Combinable)
+_GT_GeometryCollectionField = TypeVar("_GT_GeometryCollectionField", default=GeometryCollection)
+_Form_GeometryCollectionField = TypeVar(
+    "_Form_GeometryCollectionField", bound=forms.GeometryCollectionField, default=forms.GeometryCollectionField
+)
+_Geom_GeometryCollectionField = TypeVar(
+    "_Geom_GeometryCollectionField", bound=GeometryCollection, default=GeometryCollection
+)
+
 class GeometryCollectionField(
     GeometryField[
         _ST_GeometryCollectionField,

django-stubs/contrib/sites/models.pyi

@@ -1,6 +1,6 @@
 from typing import Any, ClassVar
 
-from django.contrib.flatpages.models import FlatPage, FlatPage_sites
+from django.contrib.flatpages.models import FlatPage, _FlatPage_sites
 from django.contrib.redirects.models import Redirect
 from django.db import models
 from django.db.models.fields.related_descriptors import ManyToManyDescriptor, ReverseManyToOneDescriptor
@@ -20,7 +20,7 @@ class Site(models.Model):
     pk: models.AutoField
     domain = models.CharField(max_length=100)
     name = models.CharField(max_length=50)
-    flatpage_set: ManyToManyDescriptor[FlatPage, FlatPage_sites]
+    flatpage_set: ManyToManyDescriptor[FlatPage, _FlatPage_sites]
     redirect_set: ReverseManyToOneDescriptor[Redirect]
     def natural_key(self) -> tuple[str]: ...