Add lots of missing argument & return type hints

django-stubs/conf/global_settings.pyi

@@ -83,7 +83,7 @@ DATABASES: Dict[str, Dict[str, Any]] = ...
 
 # Classes used to implement DB routing behavior.
 class Router(Protocol):
-    def allow_migrate(self, db, app_label, **hints): ...
+    def allow_migrate(self, db: str, app_label: str, **hints: Any) -> Optional[bool]: ...
 
 DATABASE_ROUTERS: List[Union[str, Router]] = ...
 

django-stubs/contrib/admin/checks.pyi

@@ -16,6 +16,6 @@ class ModelAdminChecks(BaseModelAdminChecks):
 class InlineModelAdminChecks(BaseModelAdminChecks):
     def check(self, inline_obj: BaseModelAdmin, **kwargs: Any) -> Sequence[CheckMessage]: ...  # type: ignore
 
-def must_be(type: Any, option: Any, obj: Any, id: Any): ...
-def must_inherit_from(parent: Any, option: Any, obj: Any, id: Any): ...
-def refer_to_missing_field(field: Any, option: Any, obj: Any, id: Any): ...
+def must_be(type: Any, option: Any, obj: Any, id: Any) -> Sequence[CheckMessage]: ...
+def must_inherit_from(parent: Any, option: Any, obj: Any, id: Any) -> Sequence[CheckMessage]: ...
+def refer_to_missing_field(field: Any, option: Any, obj: Any, id: Any) -> Sequence[CheckMessage]: ...

django-stubs/contrib/admin/helpers.pyi

@@ -4,6 +4,7 @@ from django import forms
 from django.contrib.admin.options import ModelAdmin
 from django.db.models import Model
 from django.db.models.fields import AutoField
+from django.forms import BaseForm
 from django.forms.boundfield import BoundField
 from django.forms.models import ModelForm
 from django.forms.utils import ErrorDict, ErrorList
@@ -143,7 +144,7 @@ class InlineAdminFormSet:
     def fields(self) -> Iterator[Dict[str, Union[Dict[str, bool], bool, Widget, str]]]: ...
     def inline_formset_data(self) -> str: ...
     @property
-    def forms(self): ...
+    def forms(self) -> List[BaseForm]: ...
     @property
     def non_form_errors(self) -> Callable[[], ErrorList]: ...
     @property
@@ -170,7 +171,7 @@ class InlineAdminForm(AdminForm):
     def pk_field(self) -> AdminField: ...
     def fk_field(self) -> AdminField: ...
     def deletion_field(self) -> AdminField: ...
-    def ordering_field(self): ...
+    def ordering_field(self) -> AdminField: ...
 
 class InlineFieldset(Fieldset):
     formset: Any = ...

django-stubs/contrib/admin/options.pyi

@@ -34,7 +34,13 @@ from django.forms.fields import Field as FormField
 from django.forms.fields import TypedChoiceField
 from django.forms.forms import BaseForm
 from django.forms.formsets import BaseFormSet
-from django.forms.models import BaseInlineFormSet, ModelChoiceField, ModelMultipleChoiceField
+from django.forms.models import (
+    BaseInlineFormSet,
+    BaseModelFormSet,
+    ModelChoiceField,
+    ModelForm,
+    ModelMultipleChoiceField,
+)
 from django.forms.widgets import Media
 from django.http.request import HttpRequest
 from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
@@ -191,8 +197,10 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
     def get_object(
         self, request: HttpRequest, object_id: str, from_field: Optional[str] = ...
     ) -> Optional[_ModelT]: ...
-    def get_changelist_form(self, request: Any, **kwargs: Any): ...
-    def get_changelist_formset(self, request: Any, **kwargs: Any): ...
+    def get_changelist_form(self, request: Any, **kwargs: Any) -> Type[ModelForm[_ModelT]]: ...
+    def get_changelist_formset(
+        self, request: Any, **kwargs: Any
+    ) -> Type[BaseModelFormSet[_ModelT, ModelForm[_ModelT]]]: ...
     def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Iterator[Any]: ...
     def get_paginator(
         self,

django-stubs/contrib/admin/utils.pyi

@@ -45,7 +45,7 @@ class NestedObjects(Collector):
     def nested(self, format_callback: Callable = ...) -> List[Any]: ...
     def can_fast_delete(self, *args: Any, **kwargs: Any) -> bool: ...
 
-def model_format_dict(obj: Union[Model, Type[Model], QuerySet, Options[Model]]): ...
+def model_format_dict(obj: Union[Model, Type[Model], QuerySet, Options[Model]]) -> Dict[str, str]: ...
 def model_ngettext(obj: Union[Options, QuerySet], n: Optional[int] = ...) -> str: ...
 def lookup_field(
     name: Union[Callable, str], obj: Model, model_admin: Optional[BaseModelAdmin] = ...

django-stubs/contrib/admindocs/utils.pyi

@@ -1,10 +1,12 @@
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Callable, Dict, List, Optional, Tuple
+
+from django.utils.safestring import SafeString
 
 docutils_is_available: bool
 
 def get_view_name(view_func: Callable) -> str: ...
 def parse_docstring(docstring: str) -> Tuple[str, str, Dict[str, str]]: ...
-def parse_rst(text: str, default_reference_context: Any, thing_being_parsed: Optional[Any] = ...): ...
+def parse_rst(text: str, default_reference_context: Any, thing_being_parsed: Optional[Any] = ...) -> SafeString: ...
 
 ROLES: Dict[str, str]
 
@@ -17,7 +19,7 @@ def default_reference_role(
     inliner: Any,
     options: Optional[Any] = ...,
     content: Optional[Any] = ...,
-): ...
+) -> Tuple[List[Any], List[Any]]: ...
 
 named_group_matcher: Any
 unnamed_group_matcher: Any

django-stubs/contrib/admindocs/views.pyi

@@ -16,7 +16,7 @@ class ModelIndexView(BaseAdminDocsView): ...
 class ModelDetailView(BaseAdminDocsView): ...
 class TemplateDetailView(BaseAdminDocsView): ...
 
-def get_return_data_type(func_name: Any): ...
+def get_return_data_type(func_name: Any) -> str: ...
 def get_readable_field_data_type(field: Union[Field, str]) -> str: ...
 def extract_views_from_urlpatterns(
     urlpatterns: Iterable[_AnyURL], base: str = ..., namespace: Optional[str] = ...

django-stubs/contrib/auth/backends.pyi

@@ -2,6 +2,7 @@ from typing import Any, Optional, Set, TypeVar, Union
 
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.contrib.auth.models import AnonymousUser, Permission
+from django.db.models import QuerySet
 from django.db.models.base import Model
 from django.http.request import HttpRequest
 
@@ -33,7 +34,7 @@ class ModelBackend(BaseBackend):
         is_active: bool = ...,
         include_superusers: bool = ...,
         obj: Optional[Model] = ...,
-    ): ...
+    ) -> QuerySet[AbstractBaseUser]: ...
 
 class AllowAllUsersModelBackend(ModelBackend): ...
 

django-stubs/contrib/auth/models.pyi

@@ -5,6 +5,7 @@ from django.contrib.auth.base_user import BaseUserManager as BaseUserManager
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.db.models import QuerySet
 from django.db.models.base import Model
 from django.db.models.manager import EmptyManager
 from typing_extensions import Literal
@@ -51,7 +52,7 @@ class UserManager(BaseUserManager[_T]):
         include_superusers: bool = ...,
         backend: Optional[str] = ...,
         obj: Optional[Model] = ...,
-    ): ...
+    ) -> QuerySet[AbstractBaseUser]: ...
 
 class PermissionsMixin(models.Model):
     is_superuser = models.BooleanField()

django-stubs/contrib/auth/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Set
+from typing import Any, Dict, Optional, Set
 
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.contrib.auth.forms import AuthenticationForm
@@ -35,7 +35,7 @@ def redirect_to_login(
 
 class PasswordContextMixin:
     extra_context: Any = ...
-    def get_context_data(self, **kwargs: Any): ...
+    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: ...
 
 class PasswordResetView(PasswordContextMixin, FormView):
     email_template_name: str = ...

django-stubs/contrib/contenttypes/fields.pyi

@@ -90,4 +90,4 @@ class GenericRelation(ForeignObject):
 
 class ReverseGenericManyToOneDescriptor(ReverseManyToOneDescriptor): ...
 
-def create_generic_related_manager(superclass: Any, rel: Any): ...
+def create_generic_related_manager(superclass: Any, rel: Any) -> Type[Any]: ...  # GenericRelatedObjectManager

django-stubs/contrib/contenttypes/forms.pyi

@@ -1,8 +1,12 @@
-from typing import Any, Optional
+from typing import Any, Optional, Type, TypeVar
 
-from django.forms.models import BaseModelFormSet
+from django.db.models import Model
+from django.forms.models import BaseModelFormSet, ModelForm
 
-class BaseGenericInlineFormSet(BaseModelFormSet):
+_M = TypeVar("_M", bound=Model)
+_ModelFormT = TypeVar("_ModelFormT", bound=ModelForm)
+
+class BaseGenericInlineFormSet(BaseModelFormSet[_M, _ModelFormT]):
     instance: Any = ...
     rel_name: Any = ...
     save_as_new: Any = ...
@@ -16,14 +20,14 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
         queryset: Optional[Any] = ...,
         **kwargs: Any
     ) -> None: ...
-    def initial_form_count(self): ...
+    def initial_form_count(self) -> int: ...
     @classmethod
-    def get_default_prefix(cls): ...
-    def save_new(self, form: Any, commit: bool = ...): ...
+    def get_default_prefix(cls) -> str: ...
+    def save_new(self, form: Any, commit: bool = ...) -> _M: ...
 
 def generic_inlineformset_factory(
-    model: Any,
-    form: Any = ...,
+    model: Type[_M],
+    form: Type[_ModelFormT] = ...,
     formset: Any = ...,
     ct_field: str = ...,
     fk_field: str = ...,
@@ -40,4 +44,4 @@ def generic_inlineformset_factory(
     validate_min: bool = ...,
     absolute_max: Optional[int] = ...,
     can_delete_extra: bool = ...,
-): ...
+) -> Type[BaseGenericInlineFormSet[_M, _ModelFormT]]: ...

django-stubs/contrib/messages/storage/base.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, Iterator, List, Optional
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
@@ -21,8 +21,8 @@ class BaseStorage:
     added_new: bool = ...
     def __init__(self, request: HttpRequest, *args: Any, **kwargs: Any) -> None: ...
     def __len__(self) -> int: ...
-    def __iter__(self): ...
-    def __contains__(self, item: Any): ...
+    def __iter__(self) -> Iterator[Message]: ...
+    def __contains__(self, item: Any) -> bool: ...
     def update(self, response: HttpResponseBase) -> Optional[List[Message]]: ...
     def add(self, level: int, message: str, extra_tags: Optional[str] = ...) -> None: ...
     level: Any = ...

django-stubs/contrib/postgres/fields/hstore.pyi

@@ -7,10 +7,10 @@ class HStoreField(CheckFieldDefaultMixin, Field):
     def get_transform(self, name) -> Any: ...
 
 class KeyTransform(Transform):
-    def __init__(self, key_name: str, *args: Any, **kwargs: Any): ...
+    def __init__(self, key_name: str, *args: Any, **kwargs: Any) -> None: ...
 
 class KeyTransformFactory:
-    def __init__(self, key_name: str): ...
+    def __init__(self, key_name: str) -> None: ...
     def __call__(self, *args, **kwargs) -> KeyTransform: ...
 
 class KeysTransform(Transform): ...

django-stubs/contrib/postgres/serializers.pyi

@@ -1,4 +1,6 @@
+from typing import Set, Tuple
+
 from django.db.migrations.serializer import BaseSerializer as BaseSerializer
 
 class RangeSerializer(BaseSerializer):
-    def serialize(self): ...
+    def serialize(self) -> Tuple[str, Set[str]]: ...

django-stubs/contrib/postgres/utils.pyi

@@ -1,3 +1,5 @@
 from typing import Any
 
-def prefix_validation_error(error: Any, prefix: Any, code: Any, params: Any): ...
+from django.core.exceptions import ValidationError
+
+def prefix_validation_error(error: Any, prefix: Any, code: Any, params: Any) -> ValidationError: ...

django-stubs/core/cache/__init__.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Type
+from typing import Any, List, Type
 
 from django.utils.connection import BaseConnectionHandler, ConnectionProxy
 
@@ -12,7 +12,7 @@ class CacheHandler(BaseConnectionHandler):
     settings_name: str = ...
     exception_class: Type[Exception] = ...
     def create_connection(self, alias: str) -> BaseCache: ...
-    def all(self, initialized_only: bool = ...): ...
+    def all(self, initialized_only: bool = ...) -> List[BaseCache]: ...
 
 def close_caches(**kwargs: Any) -> None: ...
 

django-stubs/core/cache/backends/memcached.pyi

@@ -1,10 +1,19 @@
+from types import ModuleType
+from typing import Any, Dict, Sequence, Type, Union
+
 from django.core.cache.backends.base import BaseCache
 
 class BaseMemcachedCache(BaseCache):
-    def __init__(self, server, params, library, value_not_found_exception) -> None: ...
+    def __init__(
+        self,
+        server: Union[str, Sequence[str]],
+        params: Dict[str, Any],
+        library: ModuleType,
+        value_not_found_exception: Type[BaseException],
+    ) -> None: ...
 
 class MemcachedCache(BaseMemcachedCache):
-    def __init__(self, server, params): ...
+    def __init__(self, server: Union[str, Sequence[str]], params: Dict[str, Any]) -> None: ...
 
 class PyLibMCCache(BaseMemcachedCache):
-    def __init__(self, server, params): ...
+    def __init__(self, server: Union[str, Sequence[str]], params: Dict[str, Any]) -> None: ...

django-stubs/core/management/__init__.pyi

@@ -13,7 +13,7 @@ class ManagementUtility:
     prog_name: str = ...
     settings_exception: Optional[Exception] = ...
     def __init__(self, argv: Optional[List[str]] = ...) -> None: ...
-    def main_help_text(self, commands_only: bool = ...): ...
+    def main_help_text(self, commands_only: bool = ...) -> str: ...
     def fetch_command(self, subcommand: str) -> BaseCommand: ...
     def autocomplete(self) -> None: ...
     def execute(self) -> None: ...

django-stubs/core/management/commands/sqlmigrate.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.apps import apps as apps
 from django.core.management.base import BaseCommand as BaseCommand
@@ -10,4 +10,4 @@ from django.db.migrations.loader import MigrationLoader as MigrationLoader
 
 class Command(BaseCommand):
     output_transaction: bool = ...
-    def execute(self, *args: Any, **options: Any): ...
+    def execute(self, *args: Any, **options: Any) -> Optional[str]: ...

django-stubs/core/serializers/pyyaml.pyi

@@ -4,10 +4,11 @@ from django.core.serializers.base import DeserializedObject
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.db.models.fields import Field
 from yaml import CSafeDumper as SafeDumper
+from yaml import MappingNode, ScalarNode
 
 class DjangoSafeDumper(SafeDumper):
-    def represent_decimal(self, data: Any): ...
-    def represent_ordered_dict(self, data: Any): ...
+    def represent_decimal(self, data: Any) -> ScalarNode: ...
+    def represent_ordered_dict(self, data: Any) -> MappingNode: ...
 
 class Serializer(PythonSerializer):
     internal_use_only: bool = ...

django-stubs/db/backends/base/creation.pyi

@@ -16,13 +16,13 @@ class BaseDatabaseCreation:
     def serialize_db_to_string(self) -> str: ...
     def deserialize_db_from_string(self, data: str) -> None: ...
     def clone_test_db(self, suffix: Any, verbosity: int = ..., autoclobber: bool = ..., keepdb: bool = ...) -> None: ...
-    def get_test_db_clone_settings(self, suffix: str): ...
+    def get_test_db_clone_settings(self, suffix: str) -> Dict[str, Any]: ...
     def destroy_test_db(
         self,
         old_database_name: Optional[str] = ...,
         verbosity: int = ...,
         keepdb: bool = ...,
         suffix: Optional[str] = ...,
     ) -> None: ...
-    def sql_table_creation_suffix(self): ...
+    def sql_table_creation_suffix(self) -> str: ...
     def test_db_signature(self) -> Tuple[str, str, str, str]: ...

django-stubs/db/backends/base/operations.pyi

@@ -27,7 +27,7 @@ class BaseDatabaseOperations:
     connection: BaseDatabaseWrapper
     def __init__(self, connection: BaseDatabaseWrapper) -> None: ...
     def autoinc_sql(self, table: str, column: str) -> Optional[str]: ...
-    def bulk_batch_size(self, fields: Any, objs: Any): ...
+    def bulk_batch_size(self, fields: Any, objs: Any) -> int: ...
     def cache_key_culling_sql(self) -> str: ...
     def unification_cast_sql(self, output_field: Field) -> str: ...
     def date_extract_sql(self, lookup_type: str, field_name: str) -> Any: ...
@@ -92,11 +92,11 @@ class BaseDatabaseOperations:
     def check_expression_support(self, expression: Any) -> None: ...
     def conditional_expression_supported_in_where_clause(self, expression: Any) -> bool: ...
     def combine_expression(self, connector: str, sub_expressions: List[str]) -> str: ...
-    def combine_duration_expression(self, connector: Any, sub_expressions: Any): ...
+    def combine_duration_expression(self, connector: Any, sub_expressions: Any) -> str: ...
     def binary_placeholder_sql(self, value: Optional[Case]) -> str: ...
     def modify_insert_params(self, placeholder: str, params: Any) -> Any: ...
     def integer_field_range(self, internal_type: Any) -> Tuple[int, int]: ...
-    def subtract_temporals(self, internal_type: Any, lhs: Any, rhs: Any): ...
+    def subtract_temporals(self, internal_type: Any, lhs: Any, rhs: Any) -> Tuple[str, Tuple[Any, ...]]: ...
     def window_frame_start(self, start: Any) -> str: ...
     def window_frame_end(self, end: Any) -> str: ...
     def window_frame_rows_start_end(self, start: Optional[int] = ..., end: Optional[int] = ...) -> Tuple[str, str]: ...

django-stubs/db/backends/base/schema.pyi

@@ -59,7 +59,7 @@ class BaseDatabaseSchemaEditor(ContextManager[Any]):
     def column_sql(
         self, model: Type[Model], field: Field, include_default: bool = ...
     ) -> Union[Tuple[None, None], Tuple[str, List[Any]]]: ...
-    def skip_default(self, field: Any): ...
+    def skip_default(self, field: Any) -> bool: ...
     def prepare_default(self, value: Any) -> Any: ...
     def effective_default(self, field: Field) -> Union[int, str]: ...
     def quote_value(self, value: Any) -> str: ...
@@ -81,7 +81,7 @@ class BaseDatabaseSchemaEditor(ContextManager[Any]):
     ) -> None: ...
     def alter_db_table(self, model: Type[Model], old_db_table: str, new_db_table: str) -> None: ...
     def alter_db_tablespace(self, model: Any, old_db_tablespace: Any, new_db_tablespace: Any) -> None: ...
-    def add_field(self, model: Any, field: Any): ...
-    def remove_field(self, model: Any, field: Any): ...
+    def add_field(self, model: Any, field: Any) -> None: ...
+    def remove_field(self, model: Any, field: Any) -> None: ...
     def alter_field(self, model: Type[Model], old_field: Field, new_field: Field, strict: bool = ...) -> None: ...
     def remove_procedure(self, procedure_name: Any, param_types: Any = ...) -> None: ...

django-stubs/db/backends/ddl_references.pyi

@@ -8,8 +8,8 @@ class _QuoteCallable(Protocol):
     def __call__(self, __column: str) -> str: ...
 
 class Reference:
-    def references_table(self, table: Any): ...
-    def references_column(self, table: Any, column: Any): ...
+    def references_table(self, table: Any) -> bool: ...
+    def references_column(self, table: Any, column: Any) -> bool: ...
     def rename_table_references(self, old_table: Any, new_table: Any) -> None: ...
     def rename_column_references(self, table: Any, old_column: Any, new_column: Any) -> None: ...