[3.2] Adjust contrib.admin (#589)

django-stubs/contrib/admin/__init__.pyi

@@ -1,4 +1,4 @@
-from .decorators import register as register
+from .decorators import action as action, register as register
 from .filters import (
     AllValuesFieldListFilter as AllValuesFieldListFilter,
     BooleanFieldListFilter as BooleanFieldListFilter,
@@ -9,6 +9,7 @@ from .filters import (
     RelatedFieldListFilter as RelatedFieldListFilter,
     RelatedOnlyFieldListFilter as RelatedOnlyFieldListFilter,
     SimpleListFilter as SimpleListFilter,
+    EmptyFieldListFilter as EmptyFieldListFilter,
 )
 from .helpers import ACTION_CHECKBOX_NAME as ACTION_CHECKBOX_NAME
 from .options import (

django-stubs/contrib/admin/decorators.pyi

@@ -1,6 +1,26 @@
-from typing import Any, Callable, Optional, Type
+from typing import Callable, Optional, Type, Sequence, Union, TypeVar, Any
 
+from django.contrib.admin import ModelAdmin
 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
 
+_ModelT = TypeVar("_ModelT", bound=Model)
+
+def action(
+    function: Optional[Callable[[ModelAdmin, HttpRequest, QuerySet], None]] = ...,
+    *,
+    permissions: Optional[Sequence[str]] = ...,
+    description: Optional[str] = ...,
+) -> Callable: ...
+def display(
+    function: Optional[Callable[[_ModelT], Any]] = ...,
+    *,
+    boolean: Optional[bool] = ...,
+    ordering: Optional[Union[str, Combinable, BaseExpression]] = ...,
+    description: Optional[str] = ...,
+    empty_value: Optional[str] = ...,
+) -> Callable: ...
 def register(*models: Type[Model], site: Optional[AdminSite] = ...) -> Callable: ...

django-stubs/contrib/admin/filters.pyi

@@ -108,3 +108,7 @@ class RelatedOnlyFieldListFilter(RelatedFieldListFilter):
     lookup_val_isnull: None
     title: str
     used_parameters: Dict[Any, Any]
+
+class EmptyFieldListFilter(FieldListFilter):
+    lookup_kwarg: str = ...
+    lookup_val: None = ...

django-stubs/contrib/admin/sites.pyi

@@ -40,6 +40,8 @@ class AdminSite:
     password_change_template: Optional[str] = ...
     password_change_done_template: Optional[str] = ...
     name: str = ...
+    enable_nav_sidebar: bool = ...
+    final_catch_all_view: bool = ...
     _empty_value_display: str = ...
     _registry: Dict[Type[Model], ModelAdmin]
     _global_actions: Dict[str, _ActionCallback]