Improve get_context_object_name on SingleObjectMixin and MultipleObjectMixin

django-stubs/views/generic/list.pyi

@@ -8,7 +8,7 @@ from django.views.generic.base import ContextMixin, TemplateResponseMixin, View
 
 _M = TypeVar("_M", bound=Model)
 
-class HasModel(Protocol):
+class _HasModel(Protocol):
     @property
     def model(self) -> type[Model]: ...
 
@@ -39,7 +39,7 @@ class MultipleObjectMixin(Generic[_M], ContextMixin):
     def get_paginate_orphans(self) -> int: ...
     def get_allow_empty(self) -> bool: ...
     @overload
-    def get_context_object_name(self, object_list: HasModel) -> str: ...
+    def get_context_object_name(self, object_list: _HasModel) -> str: ...
     @overload
     def get_context_object_name(self, object_list: Any) -> str | None: ...
     def get_context_data(

scripts/stubtest/allowlist.txt

@@ -131,7 +131,6 @@ django.db.backends.base.base.BaseDatabaseWrapper.ops
 django.db.backends.base.base.BaseDatabaseWrapper.ops_class
 
 # Attributes defaulting to None messing with mypy
-django.views.generic.detail.SingleObjectMixin.model
 django.views.generic.edit.BaseDeleteView.form_class
 
 # Dynamically added via django.core.management.color.make_style

tests/assert_type/views/generic.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from django.db import models
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.list import ListView
@@ -11,18 +13,18 @@ class MyDetailView(SingleObjectMixin[MyModel]): ...
 
 
 detail_view = MyDetailView()
-assert_type(detail_view.model, type[MyModel] | None)
-assert_type(detail_view.queryset, models.QuerySet[MyModel, MyModel] | None)
+assert_type(detail_view.model, Optional[type[MyModel]])
+assert_type(detail_view.queryset, Optional[models.QuerySet[MyModel, MyModel]])
 assert_type(detail_view.get_context_object_name(MyModel()), str)
-assert_type(detail_view.get_context_object_name(1), str | None)
+assert_type(detail_view.get_context_object_name(1), Optional[str])
 
 
 class MyListView(ListView[MyModel]): ...
 
 
 list_view = MyListView()
-assert_type(list_view.model, type[MyModel] | None)
-assert_type(list_view.queryset, models.QuerySet[MyModel, MyModel] | None)
+assert_type(list_view.model, Optional[type[MyModel]])
+assert_type(list_view.queryset, Optional[models.QuerySet[MyModel, MyModel]])
 assert_type(list_view.get_context_object_name(models.QuerySet[MyModel]()), str)
-assert_type(list_view.get_context_object_name(MyModel()), str | None)
-assert_type(list_view.get_context_object_name(1), str | None)
+assert_type(list_view.get_context_object_name(MyModel()), Optional[str])
+assert_type(list_view.get_context_object_name(1), Optional[str])

tests/typecheck/views/generic/test_detail.yml

@@ -37,8 +37,8 @@
             def get_queryset(self) -> QuerySet[MyModel]:
                 self.get_object(super().get_queryset())
                 return super().get_queryset()
-    custom_settings: |
-        INSTALLED_APPS = ('myapp',)
+    installed_apps:
+        - myapp
     files:
         -   path: myapp/__init__.py
         -   path: myapp/models.py
@@ -49,7 +49,7 @@
                 class Other(models.Model):
                     ...
     out: |
-      main:7: error: Incompatible types in assignment (expression has type "Type[MyModel]", base class "SingleObjectMixin" defined the type as "Type[Other]")  [assignment]
+      main:7: error: Incompatible types in assignment (expression has type "Type[MyModel]", base class "SingleObjectMixin" defined the type as "Optional[Type[Other]]")  [assignment]
       main:8: error: Incompatible types in assignment (expression has type "QuerySet[MyModel, MyModel]", base class "SingleObjectMixin" defined the type as "Optional[QuerySet[Other, Other]]")  [assignment]
       main:10: error: Return type "QuerySet[MyModel, MyModel]" of "get_queryset" incompatible with return type "QuerySet[Other, Other]" in supertype "SingleObjectMixin"  [override]
       main:12: error: Incompatible return value type (got "QuerySet[Other, Other]", expected "QuerySet[MyModel, MyModel]")  [return-value]