Disallow Any generics

django-stubs/apps/registry.pyi

@@ -13,7 +13,7 @@ class Apps:
     apps_ready: bool
     ready_event: threading.Event
     loading: bool
-    _pending_operations: dict[tuple[str, str], list]
+    _pending_operations: dict[tuple[str, str], list[Any]]
     models_ready: bool
     ready: bool
     def __init__(self, installed_apps: Iterable[AppConfig | str] | None = ...) -> None: ...
@@ -35,7 +35,7 @@ class Apps:
     def set_installed_apps(self, installed: Iterable[str]) -> None: ...
     def unset_installed_apps(self) -> None: ...
     def clear_cache(self) -> None: ...
-    def lazy_model_operation(self, function: Callable, *model_keys: Any) -> None: ...
+    def lazy_model_operation(self, function: Callable[..., Any], *model_keys: Any) -> None: ...
     def do_pending_operations(self, model: type[Model]) -> None: ...
 
 apps: Apps

django-stubs/conf/urls/static.pyi

@@ -3,4 +3,4 @@ from typing import Any
 
 from django.urls.resolvers import URLPattern
 
-def static(prefix: str, view: Callable = ..., **kwargs: Any) -> list[URLPattern]: ...
+def static(prefix: str, view: Callable[..., Any] = ..., **kwargs: Any) -> list[URLPattern]: ...

django-stubs/contrib/admin/actions.pyi

@@ -1,6 +1,9 @@
 from django.contrib.admin.options import ModelAdmin
+from django.db.models import Model
 from django.db.models.query import QuerySet
 from django.http.request import HttpRequest
 from django.template.response import TemplateResponse
 
-def delete_selected(modeladmin: ModelAdmin, request: HttpRequest, queryset: QuerySet) -> TemplateResponse | None: ...
+def delete_selected(
+    modeladmin: ModelAdmin[Model], request: HttpRequest, queryset: QuerySet[Model]
+) -> TemplateResponse | None: ...

django-stubs/contrib/admin/checks.pyi

@@ -4,15 +4,16 @@ from typing import Any
 from django.apps.config import AppConfig
 from django.contrib.admin.options import BaseModelAdmin
 from django.core.checks.messages import CheckMessage, Error
+from django.db.models import Model
 
 def check_admin_app(app_configs: Sequence[AppConfig] | None, **kwargs: Any) -> list[CheckMessage]: ...
 def check_dependencies(**kwargs: Any) -> list[CheckMessage]: ...
 
 class BaseModelAdminChecks:
-    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> list[CheckMessage]: ...
+    def check(self, admin_obj: BaseModelAdmin[Model], **kwargs: Any) -> list[CheckMessage]: ...
 
 class ModelAdminChecks(BaseModelAdminChecks):
-    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> list[CheckMessage]: ...
+    def check(self, admin_obj: BaseModelAdmin[Model], **kwargs: Any) -> list[CheckMessage]: ...
 
 class InlineModelAdminChecks(BaseModelAdminChecks):
     def check(self, inline_obj: BaseModelAdmin, **kwargs: Any) -> list[CheckMessage]: ...  # type: ignore

django-stubs/contrib/admin/decorators.pyi

@@ -6,31 +6,33 @@ from django.contrib.admin.sites import AdminSite
 from django.db.models import Combinable, QuerySet
 from django.db.models.base import Model
 from django.db.models.expressions import BaseExpression
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponseBase
 from django.utils.functional import _StrOrPromise
 from typing_extensions import TypeAlias
 
 _Model = TypeVar("_Model", bound=Model)
-_ModelAdmin = TypeVar("_ModelAdmin", bound=ModelAdmin)
+_ModelAdmin = TypeVar("_ModelAdmin", bound=ModelAdmin[Model])
 _Request = TypeVar("_Request", bound=HttpRequest)
-_QuerySet = TypeVar("_QuerySet", bound=QuerySet)
+_QuerySet = TypeVar("_QuerySet", bound=QuerySet[Model])
 # This is deliberately different from _DisplayT defined in contrib.admin.options
 _DisplayCallable: TypeAlias = Union[Callable[[_ModelAdmin, _Model], Any], Callable[[_Model], Any]]  # noqa: Y037
-_DisplayCallableT = TypeVar("_DisplayCallableT", bound=_DisplayCallable)
+_DisplayCallableT = TypeVar("_DisplayCallableT", bound=_DisplayCallable[ModelAdmin[Model], Model])
+_ActionReturn = TypeVar("_ActionReturn", bound=HttpResponseBase | None)
 
 @overload
 def action(
-    function: Callable[[_ModelAdmin, _Request, _QuerySet], None],
+    function: Callable[[_ModelAdmin, _Request, _QuerySet], _ActionReturn],
     permissions: Sequence[str] | None = ...,
     description: _StrOrPromise | None = ...,
-) -> Callable[[_ModelAdmin, _Request, _QuerySet], None]: ...
+) -> Callable[[_ModelAdmin, _Request, _QuerySet], _ActionReturn]: ...
 @overload
 def action(
     *,
     permissions: Sequence[str] | None = ...,
     description: _StrOrPromise | None = ...,
 ) -> Callable[
-    [Callable[[_ModelAdmin, _Request, _QuerySet], None]], Callable[[_ModelAdmin, _Request, _QuerySet], None]
+    [Callable[[_ModelAdmin, _Request, _QuerySet], _ActionReturn]],
+    Callable[[_ModelAdmin, _Request, _QuerySet], _ActionReturn],
 ]: ...
 @overload
 def display(

django-stubs/contrib/admin/filters.pyi

@@ -14,43 +14,45 @@ class ListFilter:
     template: str
     used_parameters: Any
     def __init__(
-        self, request: HttpRequest, params: dict[str, str], model: type[Model], model_admin: ModelAdmin
+        self, request: HttpRequest, params: dict[str, str], model: type[Model], model_admin: ModelAdmin[Model]
     ) -> None: ...
     def has_output(self) -> bool: ...
     def choices(self, changelist: Any) -> Iterator[dict[str, Any]]: ...
-    def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet | None: ...
+    def queryset(self, request: HttpRequest, queryset: QuerySet[Model]) -> QuerySet[Model] | None: ...
     def expected_parameters(self) -> list[str] | None: ...
 
 class SimpleListFilter(ListFilter):
     parameter_name: str | None
     lookup_choices: Any
     def value(self) -> str | None: ...
-    def lookups(self, request: HttpRequest, model_admin: ModelAdmin) -> Iterable[tuple[Any, str]] | None: ...
+    def lookups(self, request: HttpRequest, model_admin: ModelAdmin[Model]) -> Iterable[tuple[Any, str]] | None: ...
     def choices(self, changelist: Any) -> Iterator[dict[str, Any]]: ...
 
 class FieldListFilter(ListFilter):
-    field: Field
+    field: Field[Any, Any]
     field_path: str
     title: str
     def __init__(
         self,
-        field: Field,
+        field: Field[Any, Any],
         request: HttpRequest,
         params: dict[str, str],
         model: type[Model],
-        model_admin: ModelAdmin,
+        model_admin: ModelAdmin[Model],
         field_path: str,
     ) -> None: ...
     @classmethod
-    def register(cls, test: Callable, list_filter_class: type[FieldListFilter], take_priority: bool = ...) -> None: ...
+    def register(
+        cls, test: Callable[..., Any], list_filter_class: type[FieldListFilter], take_priority: bool = ...
+    ) -> None: ...
     @classmethod
     def create(
         cls,
-        field: Field,
+        field: Field[Any, Any],
         request: HttpRequest,
         params: dict[str, str],
         model: type[Model],
-        model_admin: ModelAdmin,
+        model_admin: ModelAdmin[Model],
         field_path: str,
     ) -> FieldListFilter: ...
 
@@ -67,7 +69,7 @@ class RelatedFieldListFilter(FieldListFilter):
     @property
     def include_empty_choice(self) -> bool: ...
     def field_choices(
-        self, field: RelatedField, request: HttpRequest, model_admin: ModelAdmin
+        self, field: RelatedField[Any, Any], request: HttpRequest, model_admin: ModelAdmin[Model]
     ) -> list[tuple[str, str]]: ...
     def choices(self, changelist: Any) -> Iterator[dict[str, Any]]: ...
 
@@ -104,7 +106,7 @@ class AllValuesFieldListFilter(FieldListFilter):
     lookup_val: Any
     lookup_val_isnull: Any
     empty_value_display: str
-    lookup_choices: QuerySet
+    lookup_choices: QuerySet[Model]
     def choices(self, changelist: Any) -> Iterator[dict[str, Any]]: ...
 
 class RelatedOnlyFieldListFilter(RelatedFieldListFilter):

django-stubs/contrib/admin/helpers.pyi

@@ -27,17 +27,17 @@ class _PrepopulatedDict(TypedDict):
 
 class AdminForm:
     prepopulated_fields: list[_PrepopulatedDict]
-    model_admin: ModelAdmin | None
+    model_admin: ModelAdmin[Model] | None
     readonly_fields: Sequence[str]
-    form: ModelForm
+    form: ModelForm[Model]
     fieldsets: list[tuple[Any, dict[str, list[str]]]]
     def __init__(
         self,
-        form: ModelForm,
+        form: ModelForm[Model],
         fieldsets: list[tuple[Any, dict[str, list[str]]]],
         prepopulated_fields: Mapping[str, Iterable[str]],
         readonly_fields: Sequence[str] | None = ...,
-        model_admin: ModelAdmin | None = ...,
+        model_admin: ModelAdmin[Model] | None = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Fieldset]: ...
     @property
@@ -48,37 +48,37 @@ class AdminForm:
     def media(self) -> Media: ...
 
 class Fieldset:
-    form: ModelForm
+    form: ModelForm[Model]
     classes: str
     description: str | None
-    model_admin: ModelAdmin | None
+    model_admin: ModelAdmin[Model] | None
     readonly_fields: Sequence[str]
     def __init__(
         self,
-        form: ModelForm,
+        form: ModelForm[Model],
         name: Any | None = ...,
         readonly_fields: Sequence[str] = ...,
         fields: Sequence[str] = ...,
         classes: Iterable[str] = ...,
         description: str | None = ...,
-        model_admin: ModelAdmin | None = ...,
+        model_admin: ModelAdmin[Model] | None = ...,
     ) -> None: ...
     @property
     def media(self) -> Media: ...
     def __iter__(self) -> Iterator[Fieldline]: ...
 
 class Fieldline:
-    form: ModelForm
+    form: ModelForm[Model]
     fields: Sequence[str]
     has_visible_field: bool
-    model_admin: ModelAdmin | None
+    model_admin: ModelAdmin[Model] | None
     readonly_fields: Sequence[str]
     def __init__(
         self,
-        form: ModelForm,
+        form: ModelForm[Model],
         field: str | Sequence[str],
         readonly_fields: Sequence[str] | None = ...,
-        model_admin: ModelAdmin | None = ...,
+        model_admin: ModelAdmin[Model] | None = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[AdminField | AdminReadonlyField]: ...
     def errors(self) -> SafeString: ...
@@ -88,7 +88,7 @@ class AdminField:
     is_first: bool
     is_checkbox: bool
     is_readonly: bool
-    def __init__(self, form: ModelForm, field: str, is_first: bool) -> None: ...
+    def __init__(self, form: ModelForm[Model], field: str, is_first: bool) -> None: ...
     def label_tag(self) -> SafeString: ...
     def errors(self) -> SafeString: ...
 
@@ -100,18 +100,18 @@ class _FieldDictT(TypedDict):
 
 class AdminReadonlyField:
     field: _FieldDictT
-    form: ModelForm
-    model_admin: ModelAdmin | None
+    form: ModelForm[Model]
+    model_admin: ModelAdmin[Model] | None
     is_first: bool
     is_checkbox: bool
     is_readonly: bool
     empty_value_display: Any
     def __init__(
         self,
-        form: ModelForm,
+        form: ModelForm[Model],
         field: Callable[[Model], Any] | str,
         is_first: bool,
-        model_admin: ModelAdmin | None = ...,
+        model_admin: ModelAdmin[Model] | None = ...,
     ) -> None: ...
     def label_tag(self) -> SafeString: ...
     def contents(self) -> SafeString: ...
@@ -120,7 +120,7 @@ class InlineAdminFormSet:
     opts: Any
     formset: Any
     fieldsets: Any
-    model_admin: ModelAdmin | None
+    model_admin: ModelAdmin[Model] | None
     readonly_fields: Sequence[str]
     prepopulated_fields: dict[str, Any]
     classes: str
@@ -135,7 +135,7 @@ class InlineAdminFormSet:
         fieldsets: Any,
         prepopulated_fields: dict[str, Any] | None = ...,
         readonly_fields: Sequence[str] | None = ...,
-        model_admin: ModelAdmin | None = ...,
+        model_admin: ModelAdmin[Model] | None = ...,
         has_add_permission: bool = ...,
         has_change_permission: bool = ...,
         has_delete_permission: bool = ...,
@@ -159,16 +159,16 @@ class InlineAdminForm(AdminForm):
     def __init__(
         self,
         formset: Any,
-        form: ModelForm,
+        form: ModelForm[Model],
         fieldsets: Any,
         prepopulated_fields: Any,
         original: bool | None,
         readonly_fields: Sequence[str] | None = ...,
-        model_admin: ModelAdmin | None = ...,
+        model_admin: ModelAdmin[Model] | None = ...,
         view_on_site_url: str | None = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[InlineFieldset]: ...
-    def needs_explicit_pk_field(self) -> bool | AutoField: ...
+    def needs_explicit_pk_field(self) -> bool | AutoField[Any, Any]: ...
     def pk_field(self) -> AdminField: ...
     def fk_field(self) -> AdminField: ...
     def deletion_field(self) -> AdminField: ...
@@ -179,4 +179,4 @@ class InlineFieldset(Fieldset):
     def __iter__(self) -> Iterator[Fieldline]: ...
 
 class AdminErrorList(forms.utils.ErrorList):
-    def __init__(self, form: ModelForm, inline_formsets: Any) -> None: ...
+    def __init__(self, form: ModelForm[Model], inline_formsets: Any) -> None: ...

django-stubs/contrib/admin/models.pyi

@@ -21,13 +21,13 @@ class LogEntryManager(models.Manager[LogEntry]):
     ) -> LogEntry: ...
 
 class LogEntry(models.Model):
-    action_time: models.DateTimeField
-    user: models.ForeignKey
-    content_type: models.ForeignKey
-    object_id: models.TextField
-    object_repr: models.CharField
-    action_flag: models.PositiveSmallIntegerField
-    change_message: models.TextField
+    action_time: models.DateTimeField[Any, Any]
+    user: models.ForeignKey[Any, Any]
+    content_type: models.ForeignKey[Any, Any]
+    object_id: models.TextField[Any, Any]
+    object_repr: models.CharField[Any, Any]
+    action_flag: models.PositiveSmallIntegerField[Any, Any]
+    change_message: models.TextField[Any, Any]
     objects: LogEntryManager
     def is_addition(self) -> bool: ...
     def is_change(self) -> bool: ...