various annotation improvements (#258)

django-stubs/contrib/admin/checks.pyi

@@ -1,11 +1,13 @@
-from typing import Any, List, Union
+from typing import Any, List, Union, Iterable, Optional
 
 from django.contrib.admin.options import BaseModelAdmin
 from django.core.checks.messages import Error
 
+from django.apps.config import AppConfig
+
 _CheckError = Union[str, Error]
 
-def check_admin_app(app_configs: None, **kwargs: Any) -> List[_CheckError]: ...
+def check_admin_app(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[_CheckError]: ...
 def check_dependencies(**kwargs: Any) -> List[_CheckError]: ...
 
 class BaseModelAdminChecks:

django-stubs/contrib/admin/sites.pyi

@@ -8,6 +8,8 @@ from django.template.response import TemplateResponse
 from django.urls.resolvers import URLResolver
 from django.utils.functional import LazyObject
 
+from django.apps.config import AppConfig
+
 all_sites: Any
 
 class AlreadyRegistered(Exception): ...
@@ -28,7 +30,7 @@ class AdminSite:
     name: str = ...
     _registry: Dict[Type[Model], ModelAdmin]
     def __init__(self, name: str = ...) -> None: ...
-    def check(self, app_configs: None) -> List[Any]: ...
+    def check(self, app_configs: Optional[Iterable[AppConfig]]) -> List[Any]: ...
     def register(
         self,
         model_or_iterable: Union[Type[Model], Iterable[Type[Model]]],
@@ -37,7 +39,7 @@ class AdminSite:
     ) -> None: ...
     def unregister(self, model_or_iterable: Union[Type[Model], Iterable[Type[Model]]]) -> None: ...
     def is_registered(self, model: Type[Model]) -> bool: ...
-    def add_action(self, action: Callable, name: None = ...) -> None: ...
+    def add_action(self, action: Callable, name: Optional[str] = ...) -> None: ...
     def disable_action(self, name: str) -> None: ...
     def get_action(self, name: str) -> Callable: ...
     @property
@@ -52,14 +54,20 @@ class AdminSite:
     @property
     def urls(self) -> Tuple[List[URLResolver], str, str]: ...
     def each_context(self, request: Any): ...
-    def password_change(self, request: WSGIRequest, extra_context: Dict[str, str] = ...) -> TemplateResponse: ...
-    def password_change_done(self, request: WSGIRequest, extra_context: None = ...) -> TemplateResponse: ...
+    def password_change(
+        self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> TemplateResponse: ...
+    def password_change_done(
+        self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> TemplateResponse: ...
     def i18n_javascript(self, request: WSGIRequest, extra_context: Optional[Dict[Any, Any]] = ...) -> HttpResponse: ...
-    def logout(self, request: WSGIRequest, extra_context: None = ...) -> TemplateResponse: ...
-    def login(self, request: WSGIRequest, extra_context: None = ...) -> HttpResponse: ...
+    def logout(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
+    def login(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
     def get_app_list(self, request: WSGIRequest) -> List[Any]: ...
-    def index(self, request: WSGIRequest, extra_context: Optional[Dict[str, str]] = ...) -> TemplateResponse: ...
-    def app_index(self, request: WSGIRequest, app_label: str, extra_context: None = ...) -> TemplateResponse: ...
+    def index(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
+    def app_index(
+        self, request: WSGIRequest, app_label: str, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> TemplateResponse: ...
 
 class DefaultAdminSite(LazyObject): ...
 

django-stubs/contrib/admin/utils.pyi

@@ -9,12 +9,10 @@ from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.deletion import Collector
-from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.fields.reverse_related import ManyToOneRel
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
 from django.forms.forms import BaseForm
-from django.utils.safestring import SafeText
 
 from django.db.models.fields import Field, reverse_related
 
@@ -27,7 +25,7 @@ def unquote(s: str) -> str: ...
 def flatten(fields: Any) -> List[Union[Callable, str]]: ...
 def flatten_fieldsets(fieldsets: Any) -> List[Union[Callable, str]]: ...
 def get_deleted_objects(
-    objs: QuerySet, request: WSGIRequest, admin_site: AdminSite
+    objs: Sequence[Optional[Model]], request: WSGIRequest, admin_site: AdminSite
 ) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
 
 class NestedObjects(Collector):
@@ -41,22 +39,14 @@ class NestedObjects(Collector):
     model_objs: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def add_edge(self, source: Optional[Model], target: Model) -> None: ...
-    def collect(
-        self,
-        objs: Union[Sequence[Optional[Model]], QuerySet],
-        source: Optional[Type[Model]] = ...,
-        source_attr: Optional[str] = ...,
-        **kwargs: Any
-    ) -> None: ...
-    def related_objects(self, related: ManyToOneRel, objs: List[Model]) -> QuerySet: ...
-    def nested(self, format_callback: Callable = ...) -> Union[List[SafeText], List[int]]: ...
-    def can_fast_delete(self, *args: Any, **kwargs: Any) -> bool: ...
+    def related_objects(self, related: ManyToOneRel, objs: Sequence[Optional[Model]]) -> QuerySet: ...
+    def nested(self, format_callback: Callable = ...) -> List[Any]: ...
 
 def model_format_dict(obj: Any): ...
 def model_ngettext(obj: Union[Options, QuerySet], n: Optional[int] = ...) -> str: ...
 def lookup_field(
     name: Union[Callable, str], obj: Model, model_admin: BaseModelAdmin = ...
-) -> Tuple[Optional[Field], Callable, Callable]: ...
+) -> Tuple[Optional[Field], Any, Any]: ...
 def label_for_field(
     name: Union[Callable, str],
     model: Type[Model],
@@ -65,16 +55,14 @@ def label_for_field(
     form: Optional[BaseForm] = ...,
 ) -> Union[Tuple[Optional[str], Union[Callable, Type[str]]], str]: ...
 def help_text_for_field(name: str, model: Type[Model]) -> str: ...
-def display_for_field(
-    value: Any, field: Union[Field, reverse_related.OneToOneRel], empty_value_display: str
-) -> str: ...
+def display_for_field(value: Any, field: Field, empty_value_display: str) -> str: ...
 def display_for_value(value: Any, empty_value_display: str, boolean: bool = ...) -> str: ...
 
 class NotRelationField(Exception): ...
 
 def get_model_from_relation(field: Union[Field, reverse_related.ForeignObjectRel]) -> Type[Model]: ...
 def reverse_field_path(model: Type[Model], path: str) -> Tuple[Type[Model], str]: ...
-def get_fields_from_path(model: Type[Model], path: str) -> List[Union[Field, FieldCacheMixin]]: ...
+def get_fields_from_path(model: Type[Model], path: str) -> List[Field]: ...
 def construct_change_message(
     form: AdminPasswordChangeForm, formsets: None, add: bool
 ) -> List[Dict[str, Dict[str, List[str]]]]: ...