5.0: Update django.db.models.field.related_descriptors (#2157)

* 5.0: Update django.db.models.field.related_descriptors

* Added types using QuerySet[Any] and Callable[..., Any]

Author: JaeHyuckSa

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

@@ -27,16 +27,19 @@ class ForwardManyToOneDescriptor(Generic[_F]):
     @cached_property
     def RelatedObjectDoesNotExist(self) -> type[ObjectDoesNotExist]: ...
     def is_cached(self, instance: Model) -> bool: ...
-    def get_queryset(self, **hints: Any) -> QuerySet: ...
+    def get_queryset(self, **hints: Any) -> QuerySet[Any]: ...
     def get_prefetch_queryset(
-        self, instances: list[Model], queryset: QuerySet | None = ...
-    ) -> tuple[QuerySet, Callable, Callable, bool, str, bool]: ...
+        self, instances: list[Model], queryset: QuerySet[Any] | None = ...
+    ) -> tuple[QuerySet[Any], Callable[..., Any], Callable[..., Any], bool, str, bool]: ...
+    def get_prefetch_querysets(
+        self, instances: list[Model], querysets: list[QuerySet[Any]] | None = ...
+    ) -> tuple[QuerySet[Any], Callable[..., Any], Callable[..., Any], bool, str, bool]: ...
     def get_object(self, instance: Model) -> Model: ...
     def __get__(
         self, instance: Model | None, cls: type[Model] | None = ...
     ) -> Model | ForwardManyToOneDescriptor | None: ...
     def __set__(self, instance: Model, value: Model | None) -> None: ...
-    def __reduce__(self) -> tuple[Callable, tuple[type[Model], str]]: ...
+    def __reduce__(self) -> tuple[Callable[..., Any], tuple[type[Model], str]]: ...
 
 class ForwardOneToOneDescriptor(ForwardManyToOneDescriptor[_F]):
     def get_object(self, instance: Model) -> Model: ...
@@ -60,6 +63,9 @@ class ReverseOneToOneDescriptor(Generic[_From, _To]):
     def get_prefetch_queryset(
         self, instances: list[_From], queryset: QuerySet[_To] | None = ...
     ) -> tuple[QuerySet[_To], Callable[..., Any], Callable[..., Any], bool, str, bool]: ...
+    def get_prefetch_querysets(
+        self, instances: list[_From], querysets: list[QuerySet[_To]] | None = ...
+    ) -> tuple[QuerySet[_To], Callable[..., Any], Callable[..., Any], bool, str, bool]: ...
     @overload
     def __get__(self, instance: None, cls: Any = ...) -> ReverseOneToOneDescriptor[_From, _To]: ...
     @overload

scripts/stubtest/allowlist_todo_django50.txt

@@ -44,10 +44,6 @@ django.db.models.expressions.Func.allowed_default
 django.db.models.expressions.When.allowed_default
 django.db.models.fields.Field._get_flatchoices
 django.db.models.fields.related.ForeignKey.cast_db_type
-django.db.models.fields.related.ForwardManyToOneDescriptor.get_prefetch_querysets
-django.db.models.fields.related.ReverseOneToOneDescriptor.get_prefetch_querysets
-django.db.models.fields.related_descriptors.ForwardManyToOneDescriptor.get_prefetch_querysets
-django.db.models.fields.related_descriptors.ReverseOneToOneDescriptor.get_prefetch_querysets
 django.db.models.lookups.Lookup.allowed_default
 django.template.autoreload