Model.objects should be a ClassVar

Model.objects is only available on classes and while we cannot force this, without ClassVar it's kind of only available on instances.

I have noticed this when I was writing a Jedi plugin that makes django-stubs work properly.

.editorconfig

@@ -0,0 +1,10 @@
+# Check http://editorconfig.org for more information
+# This is the main config file for this project:
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,35 @@
+---
+name: Bug
+about: Create a report of something is not working
+labels: 'bug'
+---
+
+# Bug report
+
+<!--
+Hi, thanks for submitting a bug. We appreciate that.
+
+But, we will need some information about what's wrong to help you.
+-->
+
+## What's wrong
+
+<!--
+Describe what is not working.
+
+Please, attach a traceback.
+We would also appreciate a failing test case.
+That is EXTREMELY helpful!
+-->
+
+## How is that should be
+
+<!-- Describe how it should work. -->
+
+## System information
+
+- OS:
+- `python` version:
+- `django` version:
+- `mypy` version:
+- `django-stubs` version:

.github/pull_request_template.md

@@ -0,0 +1,29 @@
+# I have made things!
+
+<!--
+Hi, thanks for submitting a Pull Request. We appreciate it.
+
+Please, fill in all the required information
+to make our review and merging processes easier.
+
+Cheers!
+-->
+
+## Related issues
+
+<!--
+Mark what issues this Pull Request closes or references.
+
+Format is:
+- Closes #issue-number
+- Refs #issue-number
+
+Example. Refs #0
+Documentation: https://blog.github.com/2013-05-14-closing-issues-via-pull-requests/
+-->
+
+<!--
+If you have any feedback, just write it here.
+
+It can be whatever you want!
+-->

.gitignore

@@ -8,4 +8,7 @@ out/
 build/
 dist/
 pip-wheel-metadata/
-.pytest_cache/
+.pytest_cache/
+/.envrc
+/.direnv
+django-sources/

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "django-sources"]
-	path = django-sources
-	url = https://github.com/django/django.git
-	branch = stable/2.2.x

.travis.yml

@@ -4,19 +4,33 @@ dist: xenial
 sudo: required
 jobs:
   include:
+    - name: Run plugin test suite with python 3.8
+      python: 3.8
+      script: 'pytest'
+
     - name: Run plugin test suite with python 3.7
       python: 3.7
+      script: 'pytest'
+
+    - name: Typecheck Django 3.0 test suite with python 3.8
+      python: 3.8
       script: |
-        set -e
-        pytest
+        python ./scripts/typecheck_tests.py --django_version=3.0
 
-    - name: Typecheck Django test suite with python 3.7
+    - name: Typecheck Django 3.0 test suite with python 3.7
       python: 3.7
-      script: 'python ./scripts/typecheck_tests.py'
+      script: |
+        python ./scripts/typecheck_tests.py --django_version=3.0
 
-    - name: Typecheck Django test suite with python 3.6
+    - name: Typecheck Django 3.0 test suite with python 3.6
       python: 3.6
-      script: 'python ./scripts/typecheck_tests.py'
+      script: |
+        python ./scripts/typecheck_tests.py --django_version=3.0
+
+    - name: Typecheck Django 2.2 test suite with python 3.7
+      python: 3.7
+      script: |
+        python ./scripts/typecheck_tests.py --django_version=2.2
 
     - name: Mypy for plugin code
       python: 3.7
@@ -24,18 +38,24 @@ jobs:
 
     - name: Lint with black
       python: 3.7
-      script: 'black --check --line-length=120 django-stubs/'
+      script: 'black --check django-stubs/'
 
     - name: Lint plugin code with flake8
       python: 3.7
       script: 'flake8'
 
+    - name: Lint stubs with flake8-pyi and check for unused imports
+      python: 3.7
+      script: 'flake8 --config flake8-pyi.ini'
+
     - name: Lint plugin code with isort
       python: 3.7
-      script: 'isort --check'
+      script: 'isort --check --diff'
 
 before_install: |
-  # Upgrade pip, setuptools, and wheel
+  sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
+  sudo apt-get update
+  sudo apt-get install -y binutils libproj-dev gdal-bin
   pip install -U pip setuptools wheel
 install: |
-  pip install -r ./dev-requirements.txt
+  pip install -r ./dev-requirements.txt

CONTRIBUTING.md

@@ -0,0 +1,111 @@
+# How to contribute
+
+## Tutorials
+
+If you want to start working on this project,
+you will need to get familiar with these projects:
+
+- [Django docs](https://docs.djangoproject.com/en/dev/)
+- [Typing in Python](https://inventwithpython.com/blog/2019/11/24/type-hints-for-busy-python-programmers/)
+- [How to write custom mypy plugins](https://mypy.readthedocs.io/en/stable/extending_mypy.html)
+- [Typechecking Django and DRF](https://sobolevn.me/2019/08/typechecking-django-and-drf) guide
+- [Testing mypy stubs, plugins, and types](https://sobolevn.me/2019/08/testing-mypy-types) guide
+
+It is also recommended to take a look at these resources:
+
+- [Awesome Python Typing](https://github.com/typeddjango/awesome-python-typing)
+
+
+## Dev documentation
+
+TODO
+
+
+## Dependencies
+
+We use `pip` to manage the dependencies.
+
+To install them you would need to activate your `virtualenv` and run `install` command:
+
+```bash
+pip install -r ./dev-requirements.txt
+```
+
+
+## Tests and linters
+
+We use `mypy`, `pytest`, `flake8`, and `black` for quality control.
+Here's [how we run our CI](https://github.com/typeddjango/django-stubs/blob/master/.travis.yml).
+
+### Typechecking
+
+To run typechecking use:
+
+```bash
+mypy ./mypy_django_plugin
+```
+
+### Testing
+
+There are unit tests and type-related tests.
+
+To run unit tests:
+
+```bash
+pytest
+```
+
+Type-related tests ensure that different Django versions do work correctly.
+To run type-related tests:
+
+```bash
+python ./scripts/typecheck_tests.py --django_version=2.2
+python ./scripts/typecheck_tests.py --django_version=3.0
+```
+
+Currently we only support two Django versions.
+
+### Linting
+
+To run auto-formatting:
+
+```bash
+isort -rc .
+black django-stubs/
+```
+
+To run linting:
+
+```bash
+flake8
+flake8 --config flake8-pyi.ini
+```
+
+
+## Submitting your code
+
+We use [trunk based](https://trunkbaseddevelopment.com/)
+development (we also sometimes call it `wemake-git-flow`).
+
+What the point of this method?
+
+1. We use protected `master` branch,
+   so the only way to push your code is via pull request
+2. We use issue branches: to implement a new feature or to fix a bug
+   create a new branch named `issue-$TASKNUMBER`
+3. Then create a pull request to `master` branch
+4. We use `git tag`s to make releases, so we can track what has changed
+   since the latest release
+
+So, this way we achieve an easy and scalable development process
+which frees us from merging hell and long-living branches.
+
+In this method, the latest version of the app is always in the `master` branch.
+
+
+## Other help
+
+You can contribute by spreading a word about this library.
+It would also be a huge contribution to write
+a short article on how you are using this project.
+You can also share your best practices with us.

README.md

@@ -1,66 +1,120 @@
 <img src="http://mypy-lang.org/static/mypy_light.svg" alt="mypy logo" width="300px"/>
 
-# pep484 stubs for Django framework
+# Typesafe Django Framework
 
-[![Build Status](https://travis-ci.org/mkurnikov/django-stubs.svg?branch=master)](https://travis-ci.org/mkurnikov/django-stubs)
+[![Build Status](https://travis-ci.com/typeddjango/django-stubs.svg?branch=master)](https://travis-ci.com/typeddjango/django-stubs)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
+[![Gitter](https://badges.gitter.im/mypy-django/Lobby.svg)](https://gitter.im/mypy-django/Lobby)
 
-This package contains type stubs and mypy plugin to provide more precise static types and type inference for Django framework. Django uses some Python "magic" that makes having precise types for some code patterns problematic. This is why we need to accompany the stubs with mypy plugins. The final goal is to be able to get precise types for most common patterns.
+This package contains [type stubs](https://www.python.org/dev/peps/pep-0561/) and a custom mypy plugin to provide more precise static types and type inference for Django framework. Django uses some Python "magic" that makes having precise types for some code patterns problematic. This is why we need this project. The final goal is to be able to get precise types for most common patterns.
 
-Supports Python 3.6/3.7, and Django 2.1/2.2.
-
-Could be run on earlier versions of Django, but expect some missing imports warnings.
 
 ## Installation
 
-```
+```bash
 pip install django-stubs
 ```
 
-### WARNING: All configuration from pre-1.0.0 versions is dropped, use one below.
+See [Configuration](#configuration) section to get started.
 
-### WARNING: 1.0.0 breaks `dmypy`, if you need it, stay on the 0.12.x series. 
 
-To make mypy aware of the plugin, you need to add
+## Configuration
 
-```
+To make `mypy` happy, you will need to add:
+
+```ini
 [mypy]
 plugins =
     mypy_django_plugin.main
-```
-
-in your `mypy.ini` file.
-
-Plugin requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified inside `mypy.ini` file.
-```
-[mypy]
-strict_optional = True
-
-; this one is new
+    
 [mypy.plugins.django-stubs]
-django_settings_module = mysettings
+django_settings_module = "myproject.settings"
 ```
-where `mysettings` is a value of `DJANGO_SETTINGS_MODULE` (with or without quotes)
 
-New implementation uses Django runtime to extract models information, so it will crash, if your installed apps `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
+in your `mypy.ini` or `setup.cfg` [file](https://mypy.readthedocs.io/en/latest/config_file.html).
+
+Two things happeining here:
+
+1. We need to explicitly list our plugin to be loaded by `mypy`
+2. Our plugin also requires `django` settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified
+
+This fully working [typed boilerplate](https://github.com/wemake-services/wemake-django-template) can serve you as an example.
+
+
+## Version compatibility
+
+We rely on different `django` and `mypy` versions:
+
+| django-stubs | mypy version | django version | python version
+| ------------ | ---- | ---- | ---- |
+| 1.5.0 | 0.780 | 2.2.x \|\| 3.x | ^3.6
+| 1.4.0 | 0.770 | 2.2.x \|\| 3.x | ^3.6
+| 1.3.0 | 0.750 | 2.2.x \|\| 3.x | ^3.6
+| 1.2.0 | 0.730 | 2.2.x | ^3.6
+| 1.1.0 | 0.720 | 2.2.x | ^3.6
+| 0.12.x | old semantic analyzer (<0.711), dmypy support | 2.1.x | ^3.6
+
+
+## FAQ
+
+### Is this an official Django project?
+
+No, it is not. We are indendepent from Django at the moment.
+There's a [proposal](https://github.com/django/deps/pull/65) to merge our project into the Django itself.
+You show your support by linking the PR.
+
+### Is it safe to use this in production?
+
+Yes, it is! This project does not affect your runtime at all.
+It only affects `mypy` type checking process.
+
+But, it does not make any sense to use this project without `mypy`.
+
+### mypy crashes when I run it with this plugin installed
+
+Current implementation uses Django runtime to extract models information, so it will crash, if your installed apps or `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
 
 In other words, if your `manage.py runserver` crashes, mypy will crash too. 
+You can also run `mypy` with [`--tb`](https://mypy.readthedocs.io/en/stable/command_line.html#cmdoption-mypy-show-traceback)
+option to get extra information about the error.
 
-## Notes
+### I cannot use QuerySet or Manager with type annotations
 
-Implementation monkey-patches Django to add `__class_getitem__` to the `Manager` class. If you'd use Python3.7 and do that too in your code, you can make things like
+You can get a `TypeError: 'type' object is not subscriptable` 
+when you will try to use `QuerySet[MyModel]` or `Manager[MyModel]`.
+
+This happens because Django classes do not support [`__class_getitem__`](https://www.python.org/dev/peps/pep-0560/#class-getitem) magic method.
+
+You can use strings instead: `'QuerySet[MyModel]'` and `'Manager[MyModel]'`, this way it will work as a type for `mypy` and as a regular `str` in runtime.
+
+Currently we [are working](https://github.com/django/django/pull/12405) on providing `__class_getitem__` to the classes where we need them.
+
+### How can I use HttpRequest with custom user model?
+
+You can subclass standard request like so:
+
+```python
+from django.http import HttpRequest
+from my_user_app.models import MyUser
+
+class MyRequest(HttpRequest):
+    user: MyUser
 ```
-class MyUserManager(models.Manager['MyUser']):
-    pass
-class MyUser(models.Model):
-    objects = UserManager()
-```
-work, which should make a error messages a bit better. 
 
-Otherwise, custom type will be created in mypy, named `MyUser__MyUserManager`, which will rewrite base manager as `models.Manager[User]` to make methods like `get_queryset()` and others return properly typed `QuerySet`. 
+And then use `MyRequest` instead of standard `HttpRequest` inside your project.
+
+
+## Related projects
+
+- [`awesome-python-typing`](https://github.com/typeddjango/awesome-python-typing) - Awesome list of all typing-related things in Python.
+- [`djangorestframework-stubs`](https://github.com/typeddjango/djangorestframework-stubs) - Stubs for Django REST Framework.
+- [`pytest-mypy-plugins`](https://github.com/typeddjango/pytest-mypy-plugins) - `pytest` plugin that we use for testing `mypy` stubs and plugins.
+- [`wemake-django-template`](https://github.com/wemake-services/wemake-django-template) - Create new typed Django projects in seconds.
+
+
 
 ## To get help
 
-We have Gitter here https://gitter.im/mypy-django/Lobby.
+We have Gitter here: <https://gitter.im/mypy-django/Lobby>
 
-If you think you have more generic typing issue, please refer to https://github.com/python/mypy and their Gitter.
+If you think you have more generic typing issue, please refer to <https://github.com/python/mypy> and their Gitter.

dev-requirements.txt

@@ -1,5 +1,8 @@
 black
-pytest-mypy-plugins==1.0.3
-flake8
-isort==4.3.4
+pytest-mypy-plugins==1.3.0
+psycopg2
+flake8==3.7.9
+flake8-pyi==19.3.0
+isort==4.3.21
+gitpython==3.1.0
 -e .

django-stubs/apps/config.pyi

@@ -1,5 +1,6 @@
 from typing import Any, Iterator, Type, Optional, Dict
 
+from django.apps.registry import Apps
 from django.db.models.base import Model
 
 MODELS_MODULE_NAME: str
@@ -7,11 +8,11 @@ MODELS_MODULE_NAME: str
 class AppConfig:
     name: str = ...
     module: Optional[Any] = ...
-    apps: None = ...
+    apps: Optional[Apps] = ...
     label: str = ...
     verbose_name: str = ...
     path: str = ...
-    models_module: None = ...
+    models_module: Optional[str] = ...
     models: Dict[str, Type[Model]] = ...
     def __init__(self, app_name: str, app_module: Optional[Any]) -> None: ...
     @classmethod

django-stubs/apps/registry.pyi

@@ -1,39 +1,37 @@
 import threading
-from collections import OrderedDict
-from typing import Any, Callable, List, Optional, Tuple, Type, Union, Iterable, DefaultDict, Dict
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
 
-from django.db.migrations.state import AppConfigStub
 from django.db.models.base import Model
 
 from .config import AppConfig
 
 class Apps:
-    all_models: "Dict[str, OrderedDict[str, Type[Model]]]" = ...
-    app_configs: "OrderedDict[str, AppConfig]" = ...
+    all_models: Dict[str, Dict[str, Type[Model]]] = ...
+    app_configs: Dict[str, AppConfig] = ...
     stored_app_configs: List[Any] = ...
     apps_ready: bool = ...
     ready_event: threading.Event = ...
     loading: bool = ...
-    _pending_operations: DefaultDict[Tuple[str, str], List]
+    _pending_operations: Dict[Tuple[str, str], List]
     models_ready: bool = ...
     ready: bool = ...
-    def __init__(self, installed_apps: Optional[Union[List[AppConfigStub], List[str], Tuple]] = ...) -> None: ...
-    def populate(self, installed_apps: Union[List[AppConfigStub], List[str], Tuple] = ...) -> None: ...
+    def __init__(self, installed_apps: Optional[Iterable[Union[AppConfig, str]]] = ...) -> None: ...
+    def populate(self, installed_apps: Iterable[Union[AppConfig, str]] = ...) -> None: ...
     def check_apps_ready(self) -> None: ...
     def check_models_ready(self) -> None: ...
     def get_app_configs(self) -> Iterable[AppConfig]: ...
     def get_app_config(self, app_label: str) -> AppConfig: ...
     # it's not possible to support it in plugin properly now
-    def get_models(self, include_auto_created: bool = ..., include_swapped: bool = ...) -> List[Type[Any]]: ...
+    def get_models(self, include_auto_created: bool = ..., include_swapped: bool = ...) -> List[Type[Model]]: ...
     def get_model(self, app_label: str, model_name: Optional[str] = ..., require_ready: bool = ...) -> Type[Any]: ...
     def register_model(self, app_label: str, model: Type[Model]) -> None: ...
     def is_installed(self, app_name: str) -> bool: ...
     def get_containing_app_config(self, object_name: str) -> Optional[AppConfig]: ...
     def get_registered_model(self, app_label: str, model_name: str) -> Type[Model]: ...
     def get_swappable_settings_name(self, to_string: str) -> Optional[str]: ...
-    def set_available_apps(self, available: List[str]) -> None: ...
+    def set_available_apps(self, available: Iterable[str]) -> None: ...
     def unset_available_apps(self) -> None: ...
-    def set_installed_apps(self, installed: Union[List[str], Tuple[str]]) -> None: ...
+    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: ...

django-stubs/conf/global_settings.pyi

@@ -345,7 +345,7 @@ SESSION_COOKIE_PATH = "/"
 SESSION_COOKIE_HTTPONLY = True
 # Whether to set the flag restricting cookie leaks on cross-site requests.
 # This can be 'Lax', 'Strict', or None to disable the flag.
-SESSION_COOKIE_SAMESITE = "Lax"
+SESSION_COOKIE_SAMESITE: Optional[str] = ...
 # Whether to save the session data on every request.
 SESSION_SAVE_EVERY_REQUEST = False
 # Whether a user's session cookie expires when the Web browser is closed.
@@ -413,7 +413,7 @@ CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = "/"
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
-CSRF_COOKIE_SAMESITE = "Lax"
+CSRF_COOKIE_SAMESITE: Optional[str] = ...
 CSRF_HEADER_NAME = "HTTP_X_CSRFTOKEN"
 CSRF_TRUSTED_ORIGINS: List[str] = ...
 CSRF_USE_SESSIONS = False

django-stubs/conf/urls/__init__.pyi

@@ -5,10 +5,10 @@ from django.http.response import HttpResponse, HttpResponseBase
 
 from django.urls import URLResolver, URLPattern
 
-handler400: Callable[..., HttpResponse] = ...
-handler403: Callable[..., HttpResponse] = ...
-handler404: Callable[..., HttpResponse] = ...
-handler500: Callable[..., HttpResponse] = ...
+handler400: Union[str, Callable[..., HttpResponse]] = ...
+handler403: Union[str, Callable[..., HttpResponse]] = ...
+handler404: Union[str, Callable[..., HttpResponse]] = ...
+handler500: Union[str, Callable[..., HttpResponse]] = ...
 
 IncludedURLConf = Tuple[List[URLResolver], Optional[str], Optional[str]]
 

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, InlineModelAdmin, ModelAdmin
+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/decorators.pyi

@@ -1,3 +1,5 @@
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Optional, Type
 
-def register(*models: Any, site: Optional[Any] = ...) -> Callable: ...
+from django.db.models.base import Model
+
+def register(*models: Type[Model], site: Optional[Any] = ...) -> Callable: ...

django-stubs/contrib/admin/filters.pyi

@@ -24,7 +24,7 @@ class SimpleListFilter(ListFilter):
     parameter_name: Any = ...
     lookup_choices: Any = ...
     def value(self) -> Optional[str]: ...
-    def lookups(self, request: Any, model_admin: Any) -> None: ...
+    def lookups(self, request: Any, model_admin: Any) -> List[Tuple[Any, str]]: ...
 
 class FieldListFilter(ListFilter):
     field: Field = ...

django-stubs/contrib/admin/helpers.pyi

@@ -1,7 +1,7 @@
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union, Iterable
 
-from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.forms.boundfield import BoundField
+from django.forms.forms import BaseForm
 from django.forms.utils import ErrorDict
 from django.forms.widgets import Media, Widget
 from django.utils.safestring import SafeText
@@ -23,10 +23,10 @@ class AdminForm:
     readonly_fields: Any = ...
     def __init__(
         self,
-        form: AdminPasswordChangeForm,
+        form: BaseForm,
         fieldsets: List[Tuple[None, Dict[str, List[str]]]],
         prepopulated_fields: Dict[Any, Any],
-        readonly_fields: Any = ...,
+        readonly_fields: Optional[Iterable[Any]] = ...,
         model_admin: Any = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Fieldset]: ...
@@ -47,7 +47,7 @@ class Fieldset:
         self,
         form: Any,
         name: Optional[Any] = ...,
-        readonly_fields: Any = ...,
+        readonly_fields: Optional[Iterable[Any]] = ...,
         fields: Any = ...,
         classes: Any = ...,
         description: Optional[Any] = ...,
@@ -64,7 +64,7 @@ class Fieldline:
     model_admin: Any = ...
     readonly_fields: Any = ...
     def __init__(
-        self, form: Any, field: Any, readonly_fields: Optional[Any] = ..., model_admin: Optional[Any] = ...
+        self, form: Any, field: Any, readonly_fields: Optional[Iterable[Any]] = ..., model_admin: Optional[Any] = ...
     ) -> None: ...
     def __iter__(self) -> Iterator[Union[AdminField, AdminReadonlyField]]: ...
     def errors(self) -> SafeText: ...

django-stubs/contrib/admin/options.pyi

@@ -1,5 +1,9 @@
 from collections import OrderedDict
-from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union
+from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union, Mapping, TypeVar
+
+from django.forms.forms import BaseForm
+from django.forms.formsets import BaseFormSet
+from typing_extensions import Literal, TypedDict
 
 from django.contrib.admin.filters import ListFilter
 from django.contrib.admin.models import LogEntry
@@ -26,8 +30,10 @@ from django.db.models.fields import Field
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str
-HORIZONTAL: Any
-VERTICAL: Any
+HORIZONTAL: Literal[1] = ...
+VERTICAL: Literal[2] = ...
+
+_Direction = Union[Literal[1], Literal[2]]
 
 def get_content_type_for_model(obj: Union[Type[Model], Model]) -> ContentType: ...
 def get_ul_class(radio_style: int) -> str: ...
@@ -37,26 +43,39 @@ class IncorrectLookupParameters(Exception): ...
 FORMFIELD_FOR_DBFIELD_DEFAULTS: Any
 csrf_protect_m: Any
 
+class _OptionalFieldOpts(TypedDict, total=False):
+    classes: Sequence[str]
+    description: str
+
+class _FieldOpts(_OptionalFieldOpts, total=True):
+    fields: Sequence[Union[str, Sequence[str]]]
+
+# Workaround for mypy issue, a Sequence type should be preferred here.
+# https://github.com/python/mypy/issues/8921
+# _FieldsetSpec = Sequence[Tuple[Optional[str], _FieldOpts]]
+_T = TypeVar("_T")
+_ListOrTuple = Union[Tuple[_T, ...], List[_T]]
+_FieldsetSpec = _ListOrTuple[Tuple[Optional[str], _FieldOpts]]
+
 class BaseModelAdmin:
-    autocomplete_fields: Any = ...
-    raw_id_fields: Any = ...
-    fields: Any = ...
-    exclude: Any = ...
-    fieldsets: Any = ...
-    form: Any = ...
-    filter_vertical: Any = ...
-    filter_horizontal: Any = ...
-    radio_fields: Any = ...
-    prepopulated_fields: Any = ...
-    formfield_overrides: Any = ...
-    readonly_fields: Any = ...
-    ordering: Any = ...
-    sortable_by: Any = ...
+    autocomplete_fields: Sequence[str] = ...
+    raw_id_fields: Sequence[str] = ...
+    fields: Sequence[Union[str, Sequence[str]]] = ...
+    exclude: Sequence[str] = ...
+    fieldsets: _FieldsetSpec = ...
+    form: Type[BaseForm] = ...
+    filter_vertical: Sequence[str] = ...
+    filter_horizontal: Sequence[str] = ...
+    radio_fields: Mapping[str, _Direction] = ...
+    prepopulated_fields: Mapping[str, Sequence[str]] = ...
+    formfield_overrides: Mapping[Type[Field], Mapping[str, Any]] = ...
+    readonly_fields: Sequence[Union[str, Callable[[Model], Any]]] = ...
+    ordering: Sequence[str] = ...
+    sortable_by: Sequence[str] = ...
     view_on_site: bool = ...
     show_full_result_count: bool = ...
     checks_class: Any = ...
     def check(self, **kwargs: Any) -> List[Union[str, Error]]: ...
-    def __init__(self) -> None: ...
     def formfield_for_dbfield(
         self, db_field: Field, request: Optional[HttpRequest], **kwargs: Any
     ) -> Optional[Field]: ...
@@ -87,15 +106,14 @@ class BaseModelAdmin:
     def get_sortable_by(self, request: HttpRequest) -> Union[List[Callable], List[str], Tuple]: ...
     def lookup_allowed(self, lookup: str, value: str) -> bool: ...
     def to_field_allowed(self, request: HttpRequest, to_field: str) -> bool: ...
-    def has_add_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
+    def has_add_permission(self, request: HttpRequest) -> bool: ...
     def has_change_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_delete_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_view_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_module_permission(self, request: HttpRequest) -> bool: ...
 
 class ModelAdmin(BaseModelAdmin):
-    formfield_overrides: Any
-    list_display: Sequence[Union[str, Callable]] = ...
+    list_display: Sequence[Union[str, Callable[[Model], Any]]] = ...
     list_display_links: Optional[Sequence[Union[str, Callable]]] = ...
     list_filter: Sequence[Union[str, Type[ListFilter], Tuple[str, Type[ListFilter]]]] = ...
     list_select_related: Union[bool, Sequence[str]] = ...
@@ -103,26 +121,25 @@ class ModelAdmin(BaseModelAdmin):
     list_max_show_all: int = ...
     list_editable: Sequence[str] = ...
     search_fields: Sequence[str] = ...
-    date_hierarchy: Optional[Any] = ...
+    date_hierarchy: Optional[str] = ...
     save_as: bool = ...
     save_as_continue: bool = ...
     save_on_top: bool = ...
-    paginator: Any = ...
+    paginator: Type = ...
     preserve_filters: bool = ...
     inlines: Sequence[Type[InlineModelAdmin]] = ...
-    add_form_template: Any = ...
-    change_form_template: Any = ...
-    change_list_template: Any = ...
-    delete_confirmation_template: Any = ...
-    delete_selected_confirmation_template: Any = ...
-    object_history_template: Any = ...
-    popup_response_template: Any = ...
-    actions: Any = ...
+    add_form_template: str = ...
+    change_form_template: str = ...
+    change_list_template: str = ...
+    delete_confirmation_template: str = ...
+    delete_selected_confirmation_template: str = ...
+    object_history_template: str = ...
+    popup_response_template: str = ...
+    actions: Sequence[Callable[[ModelAdmin, HttpRequest, QuerySet], None]] = ...
     action_form: Any = ...
     actions_on_top: bool = ...
     actions_on_bottom: bool = ...
     actions_selection_counter: bool = ...
-    checks_class: Any = ...
     model: Type[Model] = ...
     opts: Options = ...
     admin_site: AdminSite = ...
@@ -230,9 +247,9 @@ class ModelAdmin(BaseModelAdmin):
     def history_view(self, request: HttpRequest, object_id: str, extra_context: None = ...) -> HttpResponse: ...
 
 class InlineModelAdmin(BaseModelAdmin):
-    model: Any = ...
-    fk_name: Any = ...
-    formset: Any = ...
+    model: Type[Model] = ...
+    fk_name: str = ...
+    formset: BaseFormSet = ...
     extra: int = ...
     min_num: Optional[int] = ...
     max_num: Optional[int] = ...
@@ -241,8 +258,8 @@ class InlineModelAdmin(BaseModelAdmin):
     verbose_name_plural: Optional[str] = ...
     can_delete: bool = ...
     show_change_link: bool = ...
-    classes: Any = ...
-    admin_site: Any = ...
+    classes: Optional[Sequence[str]] = ...
+    admin_site: AdminSite = ...
     parent_model: Any = ...
     opts: Any = ...
     has_registered_model: Any = ...

django-stubs/contrib/admin/sites.pyi

@@ -1,13 +1,15 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
 
 from django.contrib.admin.options import ModelAdmin
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.http.response import HttpResponse
 from django.template.response import TemplateResponse
-from django.urls.resolvers import URLPattern, URLResolver
+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,16 +30,16 @@ 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[List[Type[Model]], Tuple[Type[Model]], Type[Model]],
+        model_or_iterable: Union[Type[Model], Iterable[Type[Model]]],
         admin_class: Optional[Type[ModelAdmin]] = ...,
         **options: Any
     ) -> None: ...
-    def unregister(self, model_or_iterable: Type[Model]) -> 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,21 @@ 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 _build_app_dict(self, request: WSGIRequest, label: Optional[str] = ...) -> Dict[str, Any]: ...
     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/templatetags/admin_list.pyi

@@ -27,7 +27,7 @@ class ResultList(list):
 def results(cl: ChangeList) -> Iterator[ResultList]: ...
 def result_hidden_fields(cl: ChangeList) -> Iterator[BoundField]: ...
 def result_list(
-    cl: ChangeList
+    cl: ChangeList,
 ) -> Dict[
     str, Union[List[Dict[str, Optional[Union[int, str]]]], List[ResultList], List[BoundField], ChangeList, int]
 ]: ...

django-stubs/contrib/admin/templatetags/admin_modify.pyi

@@ -1,7 +1,6 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.contrib.admin.helpers import InlineAdminForm
-from django.contrib.admin.templatetags.base import InclusionAdminNode
 from django.template.base import Parser, Token
 from django.template.context import Context, RequestContext
 

django-stubs/contrib/admin/templatetags/admin_static.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 register: Any
 

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]]]]: ...

django-stubs/contrib/admin/views/decorators.pyi

@@ -1,5 +1,7 @@
-from typing import Any, Callable, Optional
+from typing import Callable, TypeVar, overload
 
-def staff_member_required(
-    view_func: Optional[Callable] = ..., redirect_field_name: str = ..., login_url: str = ...
-) -> Callable: ...
+_C = TypeVar("_C", bound=Callable)
+@overload
+def staff_member_required(view_func: _C = ..., redirect_field_name: str = ..., login_url: str = ...) -> _C: ...
+@overload
+def staff_member_required(view_func: None = ..., redirect_field_name: str = ..., login_url: str = ...) -> Callable: ...

django-stubs/contrib/admin/views/main.pyi

@@ -2,7 +2,11 @@ from collections import OrderedDict
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.contrib.admin.filters import ListFilter, SimpleListFilter
-from django.contrib.admin.options import ModelAdmin, IS_POPUP_VAR as IS_POPUP_VAR, TO_FIELD_VAR as TO_FIELD_VAR
+from django.contrib.admin.options import (  # noqa: F401
+    ModelAdmin,
+    IS_POPUP_VAR as IS_POPUP_VAR,
+    TO_FIELD_VAR as TO_FIELD_VAR,
+)
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, CombinedExpression, OrderBy
@@ -77,9 +81,7 @@ class ChangeList:
     paginator: Any = ...
     def get_results(self, request: WSGIRequest) -> None: ...
     def get_ordering_field(self, field_name: Union[Callable, str]) -> Optional[Union[CombinedExpression, str]]: ...
-    def get_ordering(
-        self, request: WSGIRequest, queryset: QuerySet
-    ) -> Union[List[Union[Combinable, str]], List[Union[OrderBy, str]]]: ...
+    def get_ordering(self, request: WSGIRequest, queryset: QuerySet) -> List[Union[OrderBy, Combinable, str]]: ...
     def get_ordering_field_columns(self) -> OrderedDict: ...
     def get_queryset(self, request: WSGIRequest) -> QuerySet: ...
     def apply_select_related(self, qs: QuerySet) -> QuerySet: ...

django-stubs/contrib/admindocs/urls.pyi

@@ -0,0 +1,3 @@
+from typing import Any, List
+
+urlpatterns: List[Any] = ...

django-stubs/contrib/admindocs/views.pyi

@@ -3,46 +3,17 @@ from typing import Any, Optional, Union
 from django.db.models.fields import Field
 from django.views.generic import TemplateView
 
-from .utils import get_view_name
-
 MODEL_METHODS_EXCLUDE: Any
 
-class BaseAdminDocsView(TemplateView):
-    template_name: str = ...
-    def dispatch(self, request: Any, *args: Any, **kwargs: Any): ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class BookmarkletsView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class TemplateTagIndexView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class TemplateFilterIndexView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class ViewIndexView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class ViewDetailView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class ModelIndexView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class ModelDetailView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
-
-class TemplateDetailView(BaseAdminDocsView):
-    template_name: str = ...
-    def get_context_data(self, **kwargs: Any): ...
+class BaseAdminDocsView(TemplateView): ...
+class BookmarkletsView(BaseAdminDocsView): ...
+class TemplateTagIndexView(BaseAdminDocsView): ...
+class TemplateFilterIndexView(BaseAdminDocsView): ...
+class ViewIndexView(BaseAdminDocsView): ...
+class ViewDetailView(BaseAdminDocsView): ...
+class ModelIndexView(BaseAdminDocsView): ...
+class ModelDetailView(BaseAdminDocsView): ...
+class TemplateDetailView(BaseAdminDocsView): ...
 
 def get_return_data_type(func_name: Any): ...
 def get_readable_field_data_type(field: Union[Field, str]) -> str: ...

django-stubs/contrib/auth/backends.pyi

@@ -1,23 +1,34 @@
 from typing import Any, Optional, Set, Union
 
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, User, Permission
+
+from django.db.models.base import Model
+
+_AnyUser = Union[Model, AnonymousUser]
 
 UserModel: Any
 
-class ModelBackend:
+class BaseBackend:
     def authenticate(
-        self, request: Any, username: Optional[Union[int, str]] = ..., password: Optional[str] = ..., **kwargs: Any
+        self, request: Any, username: Optional[str] = ..., password: Optional[str] = ..., **kwargs: Any
     ) -> Optional[AbstractBaseUser]: ...
-    def user_can_authenticate(self, user: Optional[AbstractBaseUser]) -> bool: ...
-    def get_user_permissions(self, user_obj: AbstractBaseUser, obj: None = ...) -> Set[str]: ...
-    def get_group_permissions(self, user_obj: AbstractBaseUser, obj: None = ...) -> Set[str]: ...
-    def get_all_permissions(self, user_obj: AbstractBaseUser, obj: Optional[str] = ...) -> Set[str]: ...
-    def has_perm(
-        self, user_obj: Union[AbstractBaseUser, AnonymousUser], perm: str, obj: Optional[str] = ...
-    ) -> bool: ...
-    def has_module_perms(self, user_obj: Union[AbstractBaseUser, AnonymousUser], app_label: str) -> bool: ...
-    def get_user(self, user_id: int) -> AbstractBaseUser: ...
+    def get_user(self, user_id: int) -> Optional[AbstractBaseUser]: ...
+    def get_user_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ...
+    def get_group_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ...
+    def get_all_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ...
+    def has_perm(self, user_obj: _AnyUser, perm: str, obj: Optional[Model] = ...) -> bool: ...
+
+class ModelBackend(BaseBackend):
+    def has_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
+    def user_can_authenticate(self, user: Optional[_AnyUser]) -> bool: ...
+    def with_perm(
+        self,
+        perm: Union[str, Permission],
+        is_active: bool = ...,
+        include_superusers: bool = ...,
+        obj: Optional[Model] = ...,
+    ): ...
 
 class AllowAllUsersModelBackend(ModelBackend): ...
 

django-stubs/contrib/auth/base_user.pyi

@@ -1,9 +1,15 @@
+import sys
 from typing import Any, Optional, Tuple, List, overload, TypeVar
 
 from django.db.models.base import Model
 
 from django.db import models
 
+if sys.version_info < (3, 8):
+    from typing_extensions import Literal
+else:
+    from typing import Literal
+
 _T = TypeVar("_T", bound=Model)
 
 class BaseUserManager(models.Manager[_T]):
@@ -13,19 +19,16 @@ class BaseUserManager(models.Manager[_T]):
     def get_by_natural_key(self, username: Optional[str]) -> _T: ...
 
 class AbstractBaseUser(models.Model):
-    password: models.CharField = ...
-    last_login: models.DateTimeField = ...
-    is_active: models.BooleanField = ...
     REQUIRED_FIELDS: List[str] = ...
-    class Meta: ...
+
+    password = models.CharField(max_length=128)
+    last_login = models.DateTimeField(blank=True, null=True)
     def get_username(self) -> str: ...
-    def clean(self) -> None: ...
-    def save(self, *args: Any, **kwargs: Any) -> None: ...
     def natural_key(self) -> Tuple[str]: ...
     @property
-    def is_anonymous(self) -> bool: ...
+    def is_anonymous(self) -> Literal[False]: ...
     @property
-    def is_authenticated(self) -> bool: ...
+    def is_authenticated(self) -> Literal[True]: ...
     def set_password(self, raw_password: Optional[str]) -> None: ...
     def check_password(self, raw_password: str) -> bool: ...
     def set_unusable_password(self) -> None: ...

django-stubs/contrib/auth/checks.pyi

@@ -1,6 +1,8 @@
-from typing import Any, List
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import CheckMessage
 
-def check_user_model(app_configs: None = ..., **kwargs: Any) -> List[CheckMessage]: ...
-def check_models_permissions(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
+from django.apps.config import AppConfig
+
+def check_user_model(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ...
+def check_models_permissions(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[Any]: ...

django-stubs/contrib/auth/decorators.pyi

@@ -1,13 +1,21 @@
-from typing import Any, Callable, List, Optional, Set, Union
+from typing import Callable, List, Optional, Set, Union, TypeVar, overload
 
-from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME
+from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME  # noqa: F401
+from django.http.response import HttpResponseBase
+
+from django.contrib.auth.models import AbstractUser
+
+_VIEW = TypeVar("_VIEW", bound=Callable[..., HttpResponseBase])
 
 def user_passes_test(
-    test_func: Callable, login_url: Optional[str] = ..., redirect_field_name: str = ...
-) -> Callable: ...
-def login_required(
-    function: Optional[Callable] = ..., redirect_field_name: str = ..., login_url: Optional[str] = ...
-) -> Callable: ...
+    test_func: Callable[[AbstractUser], bool], login_url: Optional[str] = ..., redirect_field_name: str = ...
+) -> Callable[[_VIEW], _VIEW]: ...
+
+# There are two ways of calling @login_required: @with(arguments) and @bare
+@overload
+def login_required(redirect_field_name: str = ..., login_url: Optional[str] = ...) -> Callable[[_VIEW], _VIEW]: ...
+@overload
+def login_required(function: _VIEW, redirect_field_name: str = ..., login_url: Optional[str] = ...) -> _VIEW: ...
 def permission_required(
     perm: Union[List[str], Set[str], str], login_url: None = ..., raise_exception: bool = ...
-) -> Callable: ...
+) -> Callable[[_VIEW], _VIEW]: ...

django-stubs/contrib/auth/handlers/modwsgi.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 UserModel: Any
 

django-stubs/contrib/auth/management/commands/createsuperuser.pyi

@@ -1,4 +1,4 @@
-import getpass as getpass
+import getpass as getpass  # noqa: F401
 from typing import Any
 
 from django.core.management.base import BaseCommand

django-stubs/contrib/auth/mixins.pyi

@@ -23,6 +23,6 @@ class PermissionRequiredMixin(AccessMixin):
     def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
 
 class UserPassesTestMixin(AccessMixin):
-    def test_func(self) -> None: ...
+    def test_func(self) -> Optional[bool]: ...
     def get_test_func(self) -> Callable: ...
     def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...

django-stubs/contrib/auth/models.pyi

@@ -1,5 +1,7 @@
-from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar
+import sys
+from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar, Union
 
+from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.contenttypes.models import ContentType
@@ -8,24 +10,35 @@ from django.db.models.manager import EmptyManager
 
 from django.db import models
 
+if sys.version_info < (3, 8):
+    from typing_extensions import Literal
+else:
+    from typing import Literal
+
+_AnyUser = Union[Model, "AnonymousUser"]
+
 def update_last_login(sender: Type[AbstractBaseUser], user: AbstractBaseUser, **kwargs: Any) -> None: ...
 
-class PermissionManager(models.Manager):
+class PermissionManager(models.Manager["Permission"]):
     def get_by_natural_key(self, codename: str, app_label: str, model: str) -> Permission: ...
 
 class Permission(models.Model):
     content_type_id: int
-    name: models.CharField = ...
-    content_type: models.ForeignKey = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    codename: models.CharField = ...
+    objects: PermissionManager
+
+    name = models.CharField(max_length=255)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    codename = models.CharField(max_length=100)
     def natural_key(self) -> Tuple[str, str, str]: ...
 
-class GroupManager(models.Manager):
+class GroupManager(models.Manager["Group"]):
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
-    name: models.CharField = ...
-    permissions: models.ManyToManyField = models.ManyToManyField(Permission)
+    objects: GroupManager
+
+    name = models.CharField(max_length=150)
+    permissions = models.ManyToManyField(Permission)
     def natural_key(self): ...
 
 _T = TypeVar("_T", bound=Model)
@@ -37,28 +50,39 @@ class UserManager(BaseUserManager[_T]):
     def create_superuser(
         self, username: str, email: Optional[str], password: Optional[str], **extra_fields: Any
     ) -> _T: ...
+    def with_perm(
+        self,
+        perm: Union[str, Permission],
+        is_active: bool = ...,
+        include_superusers: bool = ...,
+        backend: Optional[Union[Type[ModelBackend], str]] = ...,
+        obj: Optional[Model] = ...,
+    ): ...
 
 class PermissionsMixin(models.Model):
-    is_superuser: models.BooleanField = ...
-    groups: models.ManyToManyField = models.ManyToManyField(Group)
-    user_permissions: models.ManyToManyField = models.ManyToManyField(Permission)
-    def get_group_permissions(self, obj: None = ...) -> Set[str]: ...
-    def get_all_permissions(self, obj: Optional[str] = ...) -> Set[str]: ...
-    def has_perm(self, perm: str, obj: Optional[str] = ...) -> bool: ...
-    def has_perms(self, perm_list: Collection[str], obj: None = ...) -> bool: ...
+    is_superuser = models.BooleanField()
+    groups = models.ManyToManyField(Group)
+    user_permissions = models.ManyToManyField(Permission)
+    def get_user_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    def get_group_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    def get_all_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    def has_perm(self, perm: str, obj: Optional[_AnyUser] = ...) -> bool: ...
+    def has_perms(self, perm_list: Collection[str], obj: Optional[_AnyUser] = ...) -> bool: ...
     def has_module_perms(self, app_label: str) -> bool: ...
 
 class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
     username_validator: UnicodeUsernameValidator = ...
-    username: models.CharField = ...
-    first_name: models.CharField = ...
-    last_name: models.CharField = ...
-    email: models.EmailField = ...
-    is_staff: models.BooleanField = ...
-    date_joined: models.DateTimeField = ...
+
+    username = models.CharField(max_length=150)
+    first_name = models.CharField(max_length=30, blank=True)
+    last_name = models.CharField(max_length=150, blank=True)
+    email = models.EmailField(blank=True)
+    is_staff = models.BooleanField()
+    is_active = models.BooleanField()
+    date_joined = models.DateTimeField()
+
     EMAIL_FIELD: str = ...
     USERNAME_FIELD: str = ...
-    def clean(self) -> None: ...
     def get_full_name(self) -> str: ...
     def get_short_name(self) -> str: ...
     def email_user(self, subject: str, message: str, from_email: str = ..., **kwargs: Any) -> None: ...
@@ -80,13 +104,14 @@ class AnonymousUser:
     def groups(self) -> EmptyManager: ...
     @property
     def user_permissions(self) -> EmptyManager: ...
-    def get_group_permissions(self, obj: None = ...) -> Set[Any]: ...
-    def get_all_permissions(self, obj: Any = ...) -> Set[str]: ...
-    def has_perm(self, perm: str, obj: None = ...) -> bool: ...
-    def has_perms(self, perm_list: Collection[str], obj: None = ...) -> bool: ...
+    def get_user_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    def get_group_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[Any]: ...
+    def get_all_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    def has_perm(self, perm: str, obj: Optional[_AnyUser] = ...) -> bool: ...
+    def has_perms(self, perm_list: Collection[str], obj: Optional[_AnyUser] = ...) -> bool: ...
     def has_module_perms(self, module: str) -> bool: ...
     @property
-    def is_anonymous(self) -> bool: ...
+    def is_anonymous(self) -> Literal[True]: ...
     @property
-    def is_authenticated(self) -> bool: ...
+    def is_authenticated(self) -> Literal[False]: ...
     def get_username(self) -> str: ...

django-stubs/contrib/auth/password_validation.pyi

@@ -1,7 +1,6 @@
 from pathlib import Path, PosixPath
 from typing import Any, List, Mapping, Optional, Protocol, Sequence, Set, Union
 
-from django.contrib.auth.base_user import AbstractBaseUser
 from django.db.models.base import Model
 
 _UserModel = Model

django-stubs/contrib/auth/views.pyi

@@ -55,6 +55,7 @@ class PasswordResetDoneView(PasswordContextMixin, TemplateView):
 class PasswordResetConfirmView(PasswordContextMixin, FormView):
     post_reset_login: bool = ...
     post_reset_login_backend: Any = ...
+    reset_url_token: str = ...
     title: Any = ...
     token_generator: Any = ...
     validlink: bool = ...

django-stubs/contrib/contenttypes/checks.pyi

@@ -1,4 +1,6 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
-def check_generic_foreign_keys(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
-def check_model_name_lengths(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
+from django.apps.config import AppConfig
+
+def check_generic_foreign_keys(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[Any]: ...
+def check_model_name_lengths(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[Any]: ...

django-stubs/contrib/contenttypes/fields.pyi

@@ -1,19 +1,19 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union, Generic
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.checks.messages import Error
 from django.db.models.base import Model
+from django.db.models.expressions import Combinable
+from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.fields.related import ForeignObject
 from django.db.models.fields.related_descriptors import ReverseManyToOneDescriptor
 from django.db.models.fields.reverse_related import ForeignObjectRel
-
-from django.db.models.expressions import Combinable
-from django.db.models.fields import Field, PositiveIntegerField
-from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.query import QuerySet
 from django.db.models.query_utils import FilteredRelation, PathInfo
 from django.db.models.sql.where import WhereNode
 
+from django.db.models.fields import Field, PositiveIntegerField
+
 class GenericForeignKey(FieldCacheMixin):
     # django-stubs implementation only fields
     _pyi_private_set_type: Union[Any, Combinable]

django-stubs/contrib/contenttypes/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Union
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect

django-stubs/contrib/flatpages/urls.pyi

@@ -0,0 +1,3 @@
+from typing import Any, List
+
+urlpatterns: List[Any] = ...

django-stubs/contrib/flatpages/views.pyi

@@ -1,5 +1,3 @@
-from typing import Any, Optional
-
 from django.contrib.flatpages.models import FlatPage
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import HttpResponse

django-stubs/contrib/gis/db/models/__init__.pyi

@@ -0,0 +1,13 @@
+from django.db.models import *
+
+from .fields import (
+    GeometryField as GeometryField,
+    LineStringField as LineStringField,
+    MultiLineStringField as MultiLineStringField,
+    MultiPointField as MultiPointField,
+    MultiPolygonField as MultiPolygonField,
+    PointField as PointField,
+    PolygonField as PolygonField,
+    GeometryCollectionField as GeometryCollectionField,
+    RasterField as RasterField,
+)

django-stubs/contrib/gis/db/models/fields.pyi

@@ -0,0 +1,91 @@
+from typing import Any, Iterable, NamedTuple, Optional, TypeVar, Union, Tuple
+
+from django.db.models.fields import Field, _ErrorMessagesToOverride, _FieldChoices, _ValidatorCallable
+
+_Connection = Any
+
+# __set__ value type
+_ST = TypeVar("_ST")
+# __get__ return type
+_GT = TypeVar("_GT")
+
+class SRIDCacheEntry(NamedTuple):
+    units: Any
+    units_name: str
+    geodetic: bool
+    spheroid: str
+
+def get_srid_info(srid: int, connection: _Connection) -> SRIDCacheEntry: ...
+
+class BaseSpatialField(Field[_ST, _GT]):
+    def __init__(
+        self,
+        verbose_name: Optional[Union[str, bytes]] = ...,
+        srid: int = ...,
+        spatial_index: bool = ...,
+        name: Optional[str] = ...,
+        primary_key: bool = ...,
+        max_length: Optional[int] = ...,
+        unique: bool = ...,
+        blank: bool = ...,
+        null: bool = ...,
+        db_index: bool = ...,
+        default: Any = ...,
+        editable: bool = ...,
+        auto_created: bool = ...,
+        serialize: bool = ...,
+        unique_for_date: Optional[str] = ...,
+        unique_for_month: Optional[str] = ...,
+        unique_for_year: Optional[str] = ...,
+        choices: Optional[_FieldChoices] = ...,
+        help_text: str = ...,
+        db_column: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        validators: Iterable[_ValidatorCallable] = ...,
+        error_messages: Optional[_ErrorMessagesToOverride] = ...,
+    ): ...
+    def spheroid(self, connection: _Connection) -> str: ...
+    def units(self, connection: _Connection) -> Any: ...
+    def units_name(self, connection: _Connection) -> str: ...
+    def geodetic(self, connection: _Connection) -> bool: ...
+
+class GeometryField(BaseSpatialField):
+    def __init__(
+        self,
+        verbose_name: Optional[Union[str, bytes]] = ...,
+        dim: int = ...,
+        geography: bool = ...,
+        extent: Tuple[float, float, float, float] = ...,
+        tolerance: float = ...,
+        srid: int = ...,
+        spatial_index: bool = ...,
+        name: Optional[str] = ...,
+        primary_key: bool = ...,
+        max_length: Optional[int] = ...,
+        unique: bool = ...,
+        blank: bool = ...,
+        null: bool = ...,
+        db_index: bool = ...,
+        default: Any = ...,
+        editable: bool = ...,
+        auto_created: bool = ...,
+        serialize: bool = ...,
+        unique_for_date: Optional[str] = ...,
+        unique_for_month: Optional[str] = ...,
+        unique_for_year: Optional[str] = ...,
+        choices: Optional[_FieldChoices] = ...,
+        help_text: str = ...,
+        db_column: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        validators: Iterable[_ValidatorCallable] = ...,
+        error_messages: Optional[_ErrorMessagesToOverride] = ...,
+    ): ...
+
+class PointField(GeometryField): ...
+class LineStringField(GeometryField): ...
+class PolygonField(GeometryField): ...
+class MultiPointField(GeometryField): ...
+class MultiLineStringField(GeometryField): ...
+class MultiPolygonField(GeometryField): ...
+class GeometryCollectionField(GeometryField): ...
+class RasterField(BaseSpatialField): ...

django-stubs/contrib/humanize/templatetags/humanize.pyi

@@ -1,15 +1,14 @@
 from datetime import date, datetime as datetime
-from decimal import Decimal
-from typing import Any, Optional, Union
+from typing import Any, Optional, SupportsInt, Union
 
 register: Any
 
-def ordinal(value: Optional[str]) -> Optional[str]: ...
-def intcomma(value: Optional[Union[Decimal, float, str]], use_l10n: bool = ...) -> str: ...
+def ordinal(value: Optional[Union[str, SupportsInt]]) -> Optional[str]: ...
+def intcomma(value: Optional[Union[str, SupportsInt]], use_l10n: bool = ...) -> str: ...
 
 intword_converters: Any
 
-def intword(value: Optional[str]) -> Optional[Union[int, str]]: ...
-def apnumber(value: Optional[str]) -> Optional[Union[int, str]]: ...
+def intword(value: Optional[Union[str, SupportsInt]]) -> Optional[Union[int, str]]: ...
+def apnumber(value: Optional[Union[str, SupportsInt]]) -> Optional[Union[int, str]]: ...
 def naturalday(value: Optional[Union[date, str]], arg: None = ...) -> Optional[str]: ...
 def naturaltime(value: datetime) -> str: ...

django-stubs/contrib/messages/context_processors.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Union
 
 from django.contrib.messages.storage.base import BaseStorage
 from django.http.request import HttpRequest

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

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional, Union
+from typing import Any, List, Optional
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase

django-stubs/contrib/messages/utils.pyi

@@ -1,3 +1,3 @@
-from typing import Dict, Optional
+from typing import Dict
 
 def get_level_tags() -> Dict[int, str]: ...

django-stubs/contrib/messages/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Dict
 
 from django.forms.forms import BaseForm
 from django.http.response import HttpResponse

django-stubs/contrib/postgres/aggregates/__init__.pyi

@@ -0,0 +1,24 @@
+from .general import (
+    ArrayAgg as ArrayAgg,
+    BitAnd as BitAnd,
+    BitOr as BitOr,
+    BoolAnd as BoolAnd,
+    BoolOr as BoolOr,
+    JSONBAgg as JSONBAgg,
+    StringAgg as StringAgg,
+)
+
+from .statistics import (
+    Corr as Corr,
+    CovarPop as CovarPop,
+    RegrAvgX as RegrAvgX,
+    RegrAvgY as RegrAvgY,
+    RegrCount as RegrCount,
+    RegrIntercept as RegrIntercept,
+    RegrR2 as RegrR2,
+    RegrSlope as RegrSlope,
+    RegrSXX as RegrSXX,
+    RegrSXY as RegrSXY,
+    RegrSYY as RegrSYY,
+    StatAggregate as StatAggregate,
+)

django-stubs/contrib/postgres/aggregates/general.pyi

@@ -0,0 +1,11 @@
+from django.db.models.aggregates import Aggregate
+
+from .mixins import OrderableAggMixin
+
+class ArrayAgg(OrderableAggMixin, Aggregate): ...
+class BitAnd(Aggregate): ...
+class BitOr(Aggregate): ...
+class BoolAnd(Aggregate): ...
+class BoolOr(Aggregate): ...
+class JSONBAgg(Aggregate): ...
+class StringAgg(OrderableAggMixin, Aggregate): ...

django-stubs/contrib/postgres/aggregates/mixins.pyi

@@ -0,0 +1 @@
+class OrderableAggMixin: ...

django-stubs/contrib/postgres/aggregates/statistics.pyi

@@ -0,0 +1,14 @@
+from django.db.models.aggregates import Aggregate
+
+class StatAggregate(Aggregate): ...
+class Corr(StatAggregate): ...
+class CovarPop(StatAggregate): ...
+class RegrAvgX(StatAggregate): ...
+class RegrAvgY(StatAggregate): ...
+class RegrCount(StatAggregate): ...
+class RegrIntercept(StatAggregate): ...
+class RegrR2(StatAggregate): ...
+class RegrSlope(StatAggregate): ...
+class RegrSXX(StatAggregate): ...
+class RegrSXY(StatAggregate): ...
+class RegrSYY(StatAggregate): ...

django-stubs/contrib/postgres/constraints.pyi

@@ -0,0 +1,18 @@
+from typing import Optional, Sequence, Tuple, Union
+
+from django.db.models.constraints import BaseConstraint
+from django.db.models.expressions import Combinable
+from django.db.models.query_utils import Q
+
+class ExclusionConstraint(BaseConstraint):
+    expressions: Sequence[Tuple[Union[str, Combinable], str]]
+    index_type: str
+    condition: Optional[Q]
+    def __init__(
+        self,
+        *,
+        name: str,
+        expressions: Sequence[Tuple[Union[str, Combinable], str]],
+        condition: Optional[Q] = ...,
+        index_type: Optional[str] = ...,
+    ): ...

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

@@ -8,6 +8,8 @@ from .ranges import (
     FloatRangeField as FloatRangeField,
     DateRangeField as DateRangeField,
     DateTimeRangeField as DateTimeRangeField,
+    RangeOperators as RangeOperators,
+    RangeBoundary as RangeBoundary,
 )
 from .hstore import HStoreField as HStoreField
 from .citext import (

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

@@ -29,3 +29,20 @@ class DateTimeRangeField(RangeField):
 
 class DateRangeField(RangeField):
     def __get__(self, instance, owner) -> DateRange: ...
+
+class RangeOperators:
+    EQUAL: str
+    NOT_EQUAL: str
+    CONTAINS: str
+    CONTAINED_BY: str
+    OVERLAPS: str
+    FULLY_LT: str
+    FULLY_GT: str
+    NOT_LT: str
+    NOT_GT: str
+    ADJACENT_TO: str
+
+class RangeBoundary(models.Expression):
+    lower: str
+    upper: str
+    def __init__(self, inclusive_lower: bool = ..., inclusive_upper: bool = ...): ...

django-stubs/contrib/postgres/indexes.pyi

@@ -1,29 +1,82 @@
-from typing import Any, Optional
+from typing import Optional, Sequence
+
+from django.db.models.query_utils import Q
 
 from django.db.models import Index
 
-class PostgresIndex(Index):
-    @property
-    def max_name_length(self) -> int: ...
+class PostgresIndex(Index): ...
 
 class BrinIndex(PostgresIndex):
     def __init__(
-        self, *, autosummarize: Optional[bool] = ..., pages_per_range: Optional[int] = ..., **kwargs: Any
+        self,
+        *,
+        autosummarize: Optional[bool] = ...,
+        pages_per_range: Optional[int] = ...,
+        fields: Sequence[str] = ...,
+        name: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        opclasses: Sequence[str] = ...,
+        condition: Optional[Q] = ...
     ) -> None: ...
 
 class BTreeIndex(PostgresIndex):
-    def __init__(self, *, fillfactor: Optional[int] = ..., **kwargs: Any): ...
+    def __init__(
+        self,
+        *,
+        fillfactor: Optional[int] = ...,
+        fields: Sequence[str] = ...,
+        name: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        opclasses: Sequence[str] = ...,
+        condition: Optional[Q] = ...
+    ) -> None: ...
 
 class GinIndex(PostgresIndex):
     def __init__(
-        self, *, fastupdate: Optional[bool] = ..., gin_pending_list_limit: Optional[int] = ..., **kwargs: Any
+        self,
+        *,
+        fastupdate: Optional[bool] = ...,
+        gin_pending_list_limit: Optional[int] = ...,
+        fields: Sequence[str] = ...,
+        name: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        opclasses: Sequence[str] = ...,
+        condition: Optional[Q] = ...
     ) -> None: ...
 
 class GistIndex(PostgresIndex):
-    def __init__(self, *, buffering: Optional[bool] = ..., fillfactor: Optional[int] = ..., **kwargs: Any) -> None: ...
+    def __init__(
+        self,
+        *,
+        buffering: Optional[bool] = ...,
+        fillfactor: Optional[int] = ...,
+        fields: Sequence[str] = ...,
+        name: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        opclasses: Sequence[str] = ...,
+        condition: Optional[Q] = ...
+    ) -> None: ...
 
 class HashIndex(PostgresIndex):
-    def __init__(self, *, fillfactor: Optional[int] = ..., **kwargs: Any) -> None: ...
+    def __init__(
+        self,
+        *,
+        fillfactor: Optional[int] = ...,
+        fields: Sequence[str] = ...,
+        name: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        opclasses: Sequence[str] = ...,
+        condition: Optional[Q] = ...
+    ) -> None: ...
 
 class SpGistIndex(PostgresIndex):
-    def __init__(self, *, fillfactor: Optional[int] = ..., **kwargs: Any) -> None: ...
+    def __init__(
+        self,
+        *,
+        fillfactor: Optional[int] = ...,
+        fields: Sequence[str] = ...,
+        name: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        opclasses: Sequence[str] = ...,
+        condition: Optional[Q] = ...
+    ) -> None: ...

django-stubs/contrib/postgres/lookups.pyi

@@ -0,0 +1,18 @@
+from django.db.models.lookups import Exact
+
+from django.db.models import Lookup, Transform
+from .search import SearchVectorExact
+
+class PostgresSimpleLookup(Lookup):
+    operator: str
+
+class DataContains(PostgresSimpleLookup): ...
+class ContainedBy(PostgresSimpleLookup): ...
+class Overlap(PostgresSimpleLookup): ...
+class HasKey(PostgresSimpleLookup): ...
+class HasKeys(PostgresSimpleLookup): ...
+class HasAnyKeys(HasKeys): ...
+class Unaccent(Transform): ...
+class SearchLookup(SearchVectorExact): ...
+class TrigramSimilar(PostgresSimpleLookup): ...
+class JSONExact(Exact): ...

django-stubs/contrib/postgres/search.pyi

@@ -1,10 +1,12 @@
 from typing import Any, Dict, Optional, TypeVar, Union
 
-from django.db.models.expressions import Combinable, CombinedExpression, Func, Value
+from django.db.models.expressions import Combinable, CombinedExpression, Func, Value, _OutputField
 from django.db.models.lookups import Lookup
 
 from django.db.models import Field
 
+_Expression = Union[str, Combinable, "SearchQueryCombinable"]
+
 class SearchVectorExact(Lookup): ...
 class SearchVectorField(Field): ...
 class SearchQueryField(Field): ...
@@ -13,11 +15,13 @@ class SearchVectorCombinable:
     ADD: str = ...
 
 class SearchVector(SearchVectorCombinable, Func):
-    config: Optional[Any] = None
-    def __init__(self, *expressions: Union[str, Combinable], **extra: Any): ...
+    config: Optional[Any] = ...
+    def __init__(self, *expressions: _Expression, **extra: Any): ...
 
 class CombinedSearchVector(SearchVectorCombinable, CombinedExpression):
-    def __init__(self, lhs, connector, rhs, config, output_field: Optional[Field, str] = ...): ...
+    def __init__(
+        self, lhs, connector, rhs, config: Optional[_Expression] = ..., output_field: Optional[_OutputField] = ...
+    ): ...
 
 _T = TypeVar("_T", bound="SearchQueryCombinable")
 
@@ -29,19 +33,31 @@ class SearchQueryCombinable:
     def __and__(self: _T, other: SearchQueryCombinable) -> _T: ...
     def __rand__(self: _T, other: SearchQueryCombinable) -> _T: ...
 
-class SearchQuery(SearchQueryCombinable, Value):
-    SEARCH_TYPES: Dict[str, str] = {"plain": "plainto_tsquery", "phrase": "phraseto_tsquery", "raw": "to_tsquery"}
-    def __init__(self, value, output_field=None, *, config=None, invert=False, search_type="plain"): ...
+class SearchQuery(SearchQueryCombinable, Value):  # type: ignore
+    SEARCH_TYPES: Dict[str, str] = ...
+    def __init__(
+        self,
+        value: str,
+        output_field: Optional[_OutputField] = ...,
+        *,
+        config: Optional[_Expression] = ...,
+        invert: bool = ...,
+        search_type: str = ...
+    ): ...
     def __invert__(self: _T) -> _T: ...
 
-class CombinedSearchQuery(SearchQueryCombinable, CombinedExpression):
-    def __init__(self, lhs, connector, rhs, config, output_field=None) -> None: ...
+class CombinedSearchQuery(SearchQueryCombinable, CombinedExpression):  # type: ignore
+    def __init__(
+        self, lhs, connector, rhs, config: Optional[_Expression] = ..., output_field: Optional[_OutputField] = ...
+    ) -> None: ...
 
 class SearchRank(Func):
-    def __init__(self, vector, query, **extra: Any) -> None: ...
+    def __init__(
+        self, vector: Union[SearchVector, _Expression], query: Union[SearchQuery, _Expression], **extra: Any
+    ) -> None: ...
 
 class TrigramBase(Func):
-    def __init__(self, expression, string, **extra: Any) -> None: ...
+    def __init__(self, expression: _Expression, string, **extra: Any) -> None: ...
 
 class TrigramSimilarity(TrigramBase): ...
 class TrigramDistance(TrigramBase): ...

django-stubs/contrib/sitemaps/__init__.pyi

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union, Protocol
 
 from django.contrib.sites.models import Site
 from django.contrib.sites.requests import RequestSite
@@ -13,10 +13,19 @@ class SitemapNotFound(Exception): ...
 
 def ping_google(sitemap_url: Optional[str] = ..., ping_url: str = ...) -> None: ...
 
+class _SupportsLen(Protocol):
+    def __len__(self) -> int: ...
+
+class _SupportsCount(Protocol):
+    def count(self) -> int: ...
+
+class _SupportsOrdered(Protocol):
+    ordered: bool = ...
+
 class Sitemap:
     limit: int = ...
     protocol: Optional[str] = ...
-    def items(self) -> List[Any]: ...
+    def items(self) -> Union[_SupportsLen, _SupportsCount, _SupportsOrdered]: ...
     def location(self, obj: Model) -> str: ...
     @property
     def paginator(self) -> Paginator: ...

django-stubs/contrib/sites/management.pyi

@@ -1,10 +1,10 @@
 from typing import Any
 
+from django.apps.config import AppConfig
 from django.apps.registry import Apps
-from django.contrib.sites.apps import SitesConfig
 
 def create_default_site(
-    app_config: SitesConfig,
+    app_config: AppConfig,
     verbosity: int = ...,
     interactive: bool = ...,
     using: str = ...,

django-stubs/contrib/sites/models.pyi

@@ -6,15 +6,16 @@ from django.db import models
 
 SITE_CACHE: Any
 
-class SiteManager(models.Manager):
+class SiteManager(models.Manager["Site"]):
     def get_current(self, request: Optional[HttpRequest] = ...) -> Site: ...
     def clear_cache(self) -> None: ...
     def get_by_natural_key(self, domain: str) -> Site: ...
 
 class Site(models.Model):
-    domain: models.CharField = ...
-    name: models.CharField = ...
-    objects: SiteManager = ...
+    objects: SiteManager
+
+    domain = models.CharField(max_length=100)
+    name = models.CharField(max_length=50)
     def natural_key(self) -> Tuple[str]: ...
 
 def clear_site_cache(sender: Type[Site], **kwargs: Any) -> None: ...

django-stubs/contrib/staticfiles/checks.pyi

@@ -1,5 +1,7 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Error
 
-def check_finders(app_configs: None = ..., **kwargs: Any) -> List[Error]: ...
+from django.apps.config import AppConfig
+
+def check_finders(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[Error]: ...

django-stubs/contrib/staticfiles/finders.pyi

@@ -37,7 +37,7 @@ def get_finders() -> Iterator[BaseFinder]: ...
 def get_finder(import_path: Literal["django.contrib.staticfiles.finders.FileSystemFinder"]) -> FileSystemFinder: ...
 @overload
 def get_finder(
-    import_path: Literal["django.contrib.staticfiles.finders.AppDirectoriesFinder"]
+    import_path: Literal["django.contrib.staticfiles.finders.AppDirectoriesFinder"],
 ) -> AppDirectoriesFinder: ...
 @overload
 def get_finder(import_path: str) -> BaseFinder: ...

django-stubs/contrib/staticfiles/management/commands/collectstatic.pyi

@@ -1,6 +1,6 @@
 from typing import Any, Dict, List
 
-from django.core.files.storage import FileSystemStorage
+from django.core.files.storage import Storage
 from django.core.management.base import BaseCommand
 
 class Command(BaseCommand):
@@ -23,6 +23,6 @@ class Command(BaseCommand):
     def log(self, msg: str, level: int = ...) -> None: ...
     def is_local_storage(self) -> bool: ...
     def clear_dir(self, path: str) -> None: ...
-    def delete_file(self, path: str, prefixed_path: str, source_storage: FileSystemStorage) -> bool: ...
-    def link_file(self, path: str, prefixed_path: str, source_storage: FileSystemStorage) -> None: ...
-    def copy_file(self, path: str, prefixed_path: str, source_storage: FileSystemStorage) -> None: ...
+    def delete_file(self, path: str, prefixed_path: str, source_storage: Storage) -> bool: ...
+    def link_file(self, path: str, prefixed_path: str, source_storage: Storage) -> None: ...
+    def copy_file(self, path: str, prefixed_path: str, source_storage: Storage) -> None: ...

django-stubs/contrib/staticfiles/storage.pyi

@@ -4,7 +4,6 @@ from typing import Any, Callable, Iterator, Optional, Tuple
 from django.core.files.base import File
 from django.core.files.storage import FileSystemStorage
 from django.utils.functional import LazyObject
-from django.utils.safestring import SafeText
 
 class StaticFilesStorage(FileSystemStorage):
     base_location: Any = ...

django-stubs/contrib/staticfiles/templatetags/staticfiles.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.template.base import Parser, Token
 from django.templatetags.static import StaticNode

django-stubs/contrib/staticfiles/testing.pyi

@@ -0,0 +1,3 @@
+from django.test import LiveServerTestCase
+
+class StaticLiveServerTestCase(LiveServerTestCase): ...

django-stubs/contrib/staticfiles/urls.pyi

@@ -2,6 +2,6 @@ from typing import Any, List, Optional
 
 from django.urls.resolvers import URLPattern
 
-urlpatterns: Any
+urlpatterns: List[Any] = ...
 
 def staticfiles_urlpatterns(prefix: Optional[str] = ...) -> List[URLPattern]: ...

django-stubs/contrib/staticfiles/utils.pyi

@@ -1,5 +1,5 @@
 from collections import OrderedDict
-from typing import Any, Iterator, List, Optional, Tuple, Union
+from typing import Iterator, List, Optional, Tuple, Union
 
 from django.core.files.storage import FileSystemStorage
 

django-stubs/contrib/staticfiles/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import FileResponse

django-stubs/contrib/syndication/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.handlers.wsgi import WSGIRequest

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

@@ -19,16 +19,16 @@ class BaseCache:
     def __init__(self, params: Dict[str, Any]) -> None: ...
     def get_backend_timeout(self, timeout: Any = ...) -> Optional[float]: ...
     def make_key(self, key: Any, version: Optional[Any] = ...) -> str: ...
-    def add(self, key: Any, value: Any, timeout: Any = ..., version: Optional[Any] = ...) -> None: ...
+    def add(self, key: Any, value: Any, timeout: Any = ..., version: Optional[Any] = ...) -> bool: ...
     def get(self, key: Any, default: Optional[Any] = ..., version: Optional[Any] = ...) -> Any: ...
     def set(self, key: Any, value: Any, timeout: Any = ..., version: Optional[Any] = ...) -> None: ...
-    def touch(self, key: Any, timeout: Any = ..., version: Optional[Any] = ...) -> None: ...
+    def touch(self, key: Any, timeout: Any = ..., version: Optional[Any] = ...) -> bool: ...
     def delete(self, key: Any, version: Optional[Any] = ...) -> None: ...
     def get_many(self, keys: List[str], version: Optional[int] = ...) -> Dict[str, Union[int, str]]: ...
     def get_or_set(
         self, key: Any, default: Optional[Any], timeout: Any = ..., version: Optional[int] = ...
     ) -> Optional[Any]: ...
-    def has_key(self, key: Any, version: Optional[Any] = ...): ...
+    def has_key(self, key: Any, version: Optional[Any] = ...) -> bool: ...
     def incr(self, key: str, delta: int = ..., version: Optional[int] = ...) -> int: ...
     def decr(self, key: str, delta: int = ..., version: Optional[int] = ...) -> int: ...
     def __contains__(self, key: str) -> bool: ...

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

@@ -1,26 +1,6 @@
-from typing import Any, Callable, Dict, Optional, Union
+from typing import Any, Dict
 
 from django.core.cache.backends.base import BaseCache
 
 class LocMemCache(BaseCache):
-    default_timeout: int
-    key_func: Callable
-    key_prefix: str
-    version: int
-    def __init__(self, name: str, params: Dict[str, Optional[Union[Callable, Dict[str, int], int, str]]]) -> None: ...
-    def add(
-        self,
-        key: str,
-        value: Union[Dict[str, int], Dict[str, str], bytes, int, str],
-        timeout: Any = ...,
-        version: Optional[int] = ...,
-    ) -> Any: ...
-    def get(
-        self, key: Union[int, str], default: Optional[Union[int, str]] = ..., version: Optional[int] = ...
-    ) -> Any: ...
-    def set(self, key: Union[int, str], value: Any, timeout: Any = ..., version: Optional[int] = ...) -> None: ...
-    def touch(self, key: str, timeout: Any = ..., version: None = ...) -> Any: ...
-    def incr(self, key: Union[int, str], delta: int = ..., version: Optional[int] = ...) -> int: ...
-    def has_key(self, key: str, version: Optional[int] = ...) -> Any: ...
-    def delete(self, key: str, version: Optional[int] = ...) -> None: ...
-    def clear(self) -> None: ...
+    def __init__(self, name: str, params: Dict[str, Any]) -> None: ...

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

@@ -0,0 +1,10 @@
+from django.core.cache.backends.base import BaseCache
+
+class BaseMemcachedCache(BaseCache):
+    def __init__(self, server, params, library, value_not_found_exception) -> None: ...
+
+class MemcachedCache(BaseMemcachedCache):
+    def __init__(self, server, params): ...
+
+class PyLibMCCache(BaseMemcachedCache):
+    def __init__(self, server, params): ...

django-stubs/core/checks/__init__.pyi

@@ -1,5 +1,17 @@
-from .messages import Warning as Warning, Info as Info, Debug as Debug, Error as Error, Critical as Critical
+from .messages import (
+    CheckMessage as CheckMessage,
+    Debug as Debug,
+    Info as Info,
+    Warning as Warning,
+    Error as Error,
+    Critical as Critical,
+    DEBUG as DEBUG,
+    INFO as INFO,
+    WARNING as WARNING,
+    ERROR as ERROR,
+    CRITICAL as CRITICAL,
+)
 
-from .registry import run_checks as run_checks, Tags as Tags, register as register
+from .registry import register as register, run_checks as run_checks, tag_exists as tag_exists, Tags as Tags
 
 from . import model_checks as model_checks

django-stubs/core/checks/caches.pyi

@@ -1,7 +1,9 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Error
 
+from django.apps.config import AppConfig
+
 E001: Any
 
-def check_default_cache_is_configured(app_configs: None, **kwargs: Any) -> List[Error]: ...
+def check_default_cache_is_configured(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Error]: ...

django-stubs/core/checks/database.pyi

@@ -1,3 +1,3 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 def check_database_backends(*args: Any, **kwargs: Any) -> List[Any]: ...

django-stubs/core/checks/messages.pyi

@@ -7,11 +7,11 @@ ERROR: int
 CRITICAL: int
 
 class CheckMessage:
-    level: Any = ...
-    msg: Any = ...
-    hint: Any = ...
+    level: int = ...
+    msg: str = ...
+    hint: Optional[str] = ...
     obj: Any = ...
-    id: Any = ...
+    id: Optional[str] = ...
     def __init__(
         self, level: int, msg: str, hint: Optional[str] = ..., obj: Any = ..., id: Optional[str] = ...
     ) -> None: ...
@@ -25,19 +25,9 @@ class Info(CheckMessage):
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
 
 class Warning(CheckMessage):
-    hint: str
-    id: str
-    level: int
-    msg: str
-    obj: Any
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
 
 class Error(CheckMessage):
-    hint: None
-    id: str
-    level: int
-    msg: str
-    obj: Any
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
 
 class Critical(CheckMessage):

django-stubs/core/checks/model_checks.pyi

@@ -1,6 +1,8 @@
-from typing import Any, List
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Warning
 
-def check_all_models(app_configs: None = ..., **kwargs: Any) -> List[Warning]: ...
-def check_lazy_references(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
+from django.apps.config import AppConfig
+
+def check_all_models(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[Warning]: ...
+def check_lazy_references(app_configs: Optional[Iterable[AppConfig]] = ..., **kwargs: Any) -> List[Any]: ...

django-stubs/core/checks/registry.pyi

@@ -12,6 +12,7 @@ class Tags:
     security: str = ...
     signals: str = ...
     templates: str = ...
+    translation: str = ...
     urls: str = ...
 
 class CheckRegistry:

django-stubs/core/checks/security/base.pyi

@@ -1,7 +1,9 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Warning
 
+from django.apps.config import AppConfig
+
 SECRET_KEY_MIN_LENGTH: int
 SECRET_KEY_MIN_UNIQUE_CHARACTERS: int
 W001: Any
@@ -17,15 +19,15 @@ W019: Any
 W020: Any
 W021: Any
 
-def check_security_middleware(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_xframe_options_middleware(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_sts(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_sts_include_subdomains(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_sts_preload(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_content_type_nosniff(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_xss_filter(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_ssl_redirect(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_secret_key(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_debug(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_xframe_deny(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_allowed_hosts(app_configs: None, **kwargs: Any) -> List[Warning]: ...
+def check_security_middleware(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_xframe_options_middleware(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_sts(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_sts_include_subdomains(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_sts_preload(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_content_type_nosniff(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_xss_filter(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_ssl_redirect(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_secret_key(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_debug(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_xframe_deny(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_allowed_hosts(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...

django-stubs/core/checks/security/csrf.pyi

@@ -1,9 +1,11 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Warning
 
+from django.apps.config import AppConfig
+
 W003: Any
 W016: Any
 
-def check_csrf_middleware(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_csrf_cookie_secure(app_configs: None, **kwargs: Any) -> List[Warning]: ...
+def check_csrf_middleware(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_csrf_cookie_secure(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...

django-stubs/core/checks/security/sessions.pyi

@@ -1,7 +1,9 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Warning
 
+from django.apps.config import AppConfig
+
 def add_session_cookie_message(message: Any): ...
 
 W010: Any
@@ -14,5 +16,5 @@ W013: Any
 W014: Any
 W015: Any
 
-def check_session_cookie_secure(app_configs: None, **kwargs: Any) -> List[Warning]: ...
-def check_session_cookie_httponly(app_configs: None, **kwargs: Any) -> List[Warning]: ...
+def check_session_cookie_secure(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
+def check_session_cookie_httponly(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...

django-stubs/core/checks/templates.pyi

@@ -1,9 +1,11 @@
-from typing import Any, List, Optional
+from typing import Any, List, Iterable, Optional
 
 from django.core.checks.messages import Error
 
+from django.apps.config import AppConfig
+
 E001: Any
 E002: Any
 
-def check_setting_app_dirs_loaders(app_configs: None, **kwargs: Any) -> List[Error]: ...
-def check_string_if_invalid_is_string(app_configs: None, **kwargs: Any) -> List[Error]: ...
+def check_setting_app_dirs_loaders(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Error]: ...
+def check_string_if_invalid_is_string(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Error]: ...

django-stubs/core/checks/urls.pyi

@@ -1,11 +1,13 @@
-from typing import Any, Callable, List, Optional, Tuple, Union
+from typing import Any, Callable, List, Tuple, Union, Iterable, Optional
 
 from django.core.checks.messages import CheckMessage, Error, Warning
 from django.urls.resolvers import URLPattern, URLResolver
 
-def check_url_config(app_configs: None, **kwargs: Any) -> List[CheckMessage]: ...
+from django.apps.config import AppConfig
+
+def check_url_config(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[CheckMessage]: ...
 def check_resolver(resolver: Union[Tuple[str, Callable], URLPattern, URLResolver]) -> List[CheckMessage]: ...
-def check_url_namespaces_unique(app_configs: None, **kwargs: Any) -> List[Warning]: ...
+def check_url_namespaces_unique(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Warning]: ...
 def get_warning_for_invalid_pattern(pattern: Any) -> List[Error]: ...
-def check_url_settings(app_configs: None, **kwargs: Any) -> List[Error]: ...
+def check_url_settings(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[Error]: ...
 def E006(name: str) -> Error: ...

django-stubs/core/files/base.pyi

@@ -8,12 +8,13 @@ _T = TypeVar("_T", bound="File")
 
 class File(FileProxyMixin, IO[Any]):
     DEFAULT_CHUNK_SIZE: Any = ...
-    file: StringIO = ...
+    file: IO[Any] = ...
     name: str = ...
     mode: str = ...
     def __init__(self, file: Any, name: Optional[str] = ...) -> None: ...
     def __bool__(self) -> bool: ...
     def __len__(self) -> int: ...
+    @property
     def size(self) -> int: ...
     def chunks(self, chunk_size: Optional[int] = ...) -> Iterator[bytes]: ...
     def multiple_chunks(self, chunk_size: Optional[int] = ...) -> bool: ...

django-stubs/core/files/uploadhandler.pyi

@@ -8,24 +8,29 @@ from django.utils.datastructures import MultiValueDict
 class UploadFileException(Exception): ...
 
 class StopUpload(UploadFileException):
-    connection_reset = ...  # type: bool
-    def __init__(self, connection_reset: bool = False) -> None: ...
+    connection_reset: bool = ...
+    def __init__(self, connection_reset: bool = ...) -> None: ...
 
 class SkipFile(UploadFileException): ...
 class StopFutureHandlers(UploadFileException): ...
 
 class FileUploadHandler:
-    chunk_size = ...  # type: int
-    file_name = ...  # type: Optional[str]
-    content_type = ...  # type: Optional[str]
-    content_length = ...  # type: Optional[int]
-    charset = ...  # type: Optional[str]
-    content_type_extra = ...  # type: Optional[Dict[str, str]]
-    request = ...  # type: Optional[HttpRequest]
-    field_name = ...  # type: str
-    def __init__(self, request: HttpRequest = None) -> None: ...
+    chunk_size: int = ...
+    file_name: Optional[str] = ...
+    content_type: Optional[str] = ...
+    content_length: Optional[int] = ...
+    charset: Optional[str] = ...
+    content_type_extra: Optional[Dict[str, str]] = ...
+    request: Optional[HttpRequest] = ...
+    field_name: str = ...
+    def __init__(self, request: Optional[HttpRequest] = ...) -> None: ...
     def handle_raw_input(
-        self, input_data: IO[bytes], META: Dict[str, str], content_length: int, boundary: str, encoding: str = None
+        self,
+        input_data: IO[bytes],
+        META: Dict[str, str],
+        content_length: int,
+        boundary: str,
+        encoding: Optional[str] = ...,
     ) -> Optional[Tuple[QueryDict, MultiValueDict[str, UploadedFile]]]: ...
     def new_file(
         self,
@@ -33,15 +38,15 @@ class FileUploadHandler:
         file_name: str,
         content_type: str,
         content_length: Optional[int],
-        charset: str = None,
-        content_type_extra: Dict[str, str] = None,
+        charset: Optional[str] = ...,
+        content_type_extra: Optional[Dict[str, str]] = ...,
     ) -> None: ...
     def receive_data_chunk(self, raw_data: bytes, start: int) -> Optional[bytes]: ...
     def file_complete(self, file_size: int) -> Optional[UploadedFile]: ...
     def upload_complete(self) -> None: ...
 
 class TemporaryFileUploadHandler(FileUploadHandler):
-    def __init__(self, request: HttpRequest = None) -> None: ...
+    def __init__(self, request: Optional[HttpRequest] = ...) -> None: ...
     file = ...  # type: TemporaryUploadedFile
     def new_file(
         self,
@@ -49,8 +54,8 @@ class TemporaryFileUploadHandler(FileUploadHandler):
         file_name: str,
         content_type: str,
         content_length: Optional[int],
-        charset: str = None,
-        content_type_extra: Dict[str, str] = None,
+        charset: Optional[str] = ...,
+        content_type_extra: Optional[Dict[str, str]] = ...,
     ) -> None: ...
     def receive_data_chunk(self, raw_data: bytes, start: int) -> Optional[bytes]: ...
     def file_complete(self, file_size: int) -> Optional[UploadedFile]: ...
@@ -59,7 +64,12 @@ class MemoryFileUploadHandler(FileUploadHandler):
     activated = ...  # type: bool
     file = ...  # type: IO[bytes]
     def handle_raw_input(
-        self, input_data: IO[bytes], META: Dict[str, str], content_length: int, boundary: str, encoding: str = None
+        self,
+        input_data: IO[bytes],
+        META: Dict[str, str],
+        content_length: int,
+        boundary: str,
+        encoding: Optional[str] = ...,
     ) -> Optional[Tuple[QueryDict, MultiValueDict[str, UploadedFile]]]: ...
     def new_file(
         self,
@@ -67,8 +77,8 @@ class MemoryFileUploadHandler(FileUploadHandler):
         file_name: str,
         content_type: str,
         content_length: Optional[int],
-        charset: str = None,
-        content_type_extra: Dict[str, str] = None,
+        charset: Optional[str] = ...,
+        content_type_extra: Optional[Dict[str, str]] = ...,
     ) -> None: ...
     def receive_data_chunk(self, raw_data: bytes, start: int) -> Optional[bytes]: ...
     def file_complete(self, file_size: int) -> Optional[UploadedFile]: ...

django-stubs/core/handlers/base.pyi

@@ -6,10 +6,6 @@ from django.http.response import HttpResponse, HttpResponseBase
 logger: Any
 
 class BaseHandler:
-    _view_middleware: None = ...
-    _template_response_middleware: None = ...
-    _exception_middleware: None = ...
-    _middleware_chain: None = ...
     def load_middleware(self) -> None: ...
     def make_view_atomic(self, view: Callable) -> Callable: ...
     def get_exception_response(self, request: Any, resolver: Any, status_code: Any, exception: Any): ...

django-stubs/core/handlers/wsgi.pyi

@@ -1,12 +1,10 @@
 from io import BytesIO
 from typing import Any, Callable, Dict, Optional, Union
 
-from django.contrib.auth.models import AbstractUser
 from django.contrib.sessions.backends.base import SessionBase
-from django.http.response import HttpResponse
-
 from django.core.handlers import base
 from django.http import HttpRequest
+from django.http.response import HttpResponse
 
 _Stream = Union[BytesIO, str]
 _WSGIEnviron = Dict[str, Any]
@@ -22,7 +20,6 @@ class LimitedStream:
 
 class WSGIRequest(HttpRequest):
     environ: _WSGIEnviron = ...
-    user: AbstractUser
     session: SessionBase
     encoding: Any = ...
     def __init__(self, environ: _WSGIEnviron) -> None: ...

django-stubs/core/mail/backends/base.pyi

@@ -1,5 +1,5 @@
 import types
-from typing import Any, TypeVar, Type, Iterable
+from typing import Any, TypeVar, Type, Iterable, Optional
 
 from django.core.mail.message import EmailMessage
 
@@ -7,7 +7,7 @@ _T = TypeVar("_T", bound="BaseEmailBackend")
 
 class BaseEmailBackend:
     def __init__(self, fail_silently: bool = ..., **kwargs: Any) -> None: ...
-    def open(self) -> bool: ...
+    def open(self) -> Optional[bool]: ...
     def close(self) -> None: ...
     def __enter__(self: _T) -> _T: ...
     def __exit__(

django-stubs/core/mail/backends/console.pyi

@@ -0,0 +1,3 @@
+from django.core.mail.backends.base import BaseEmailBackend
+
+class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/dummy.pyi

@@ -0,0 +1,3 @@
+from django.core.mail.backends.base import BaseEmailBackend
+
+class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/filebased.pyi

@@ -0,0 +1,3 @@
+from django.core.mail.backends.base import BaseEmailBackend
+
+class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/locmem.pyi

@@ -0,0 +1,3 @@
+from django.core.mail.backends.base import BaseEmailBackend
+
+class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/smtp.pyi

@@ -0,0 +1,18 @@
+import smtplib
+import threading
+from typing import Optional, Union
+
+from django.core.mail.backends.base import BaseEmailBackend
+
+class EmailBackend(BaseEmailBackend):
+    host: str = ...
+    port: int = ...
+    username: str = ...
+    password: str = ...
+    use_tls: bool = ...
+    use_ssl: bool = ...
+    timeout: Optional[int] = ...
+    ssl_keyfile: Optional[str] = ...
+    ssl_certfile: Optional[str] = ...
+    connection: Union[smtplib.SMTP_SSL, smtplib.SMTP, None] = ...
+    _lock: threading.RLock = ...

django-stubs/core/mail/message.pyi

@@ -1,8 +1,10 @@
 from email._policybase import Policy  # type: ignore
+from email.message import Message
+from email.mime.base import MIMEBase
 from email.mime.message import MIMEMessage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, overload
 
 utf8_charset: Any
 utf8_charset_qp: Any
@@ -43,6 +45,11 @@ class SafeMIMEMultipart(MIMEMixin, MIMEMultipart):
         self, _subtype: str = ..., boundary: None = ..., _subparts: None = ..., encoding: str = ..., **_params: Any
     ) -> None: ...
 
+_AttachmentContent = Union[bytes, EmailMessage, Message, SafeMIMEText, str]
+_AttachmentTuple = Union[
+    Tuple[str, _AttachmentContent], Tuple[Optional[str], _AttachmentContent, str], Tuple[str, _AttachmentContent, None]
+]
+
 class EmailMessage:
     content_subtype: str = ...
     mixed_subtype: str = ...
@@ -62,42 +69,42 @@ class EmailMessage:
         subject: str = ...,
         body: Optional[str] = ...,
         from_email: Optional[str] = ...,
-        to: Optional[Union[Sequence[str], str]] = ...,
-        bcc: Optional[Union[Sequence[str], str]] = ...,
+        to: Optional[Sequence[str]] = ...,
+        bcc: Optional[Sequence[str]] = ...,
         connection: Optional[Any] = ...,
-        attachments: Optional[Union[List[Tuple[str, str]], List[MIMEText]]] = ...,
+        attachments: Optional[Sequence[Union[MIMEBase, _AttachmentTuple]]] = ...,
         headers: Optional[Dict[str, str]] = ...,
-        cc: Optional[Union[Sequence[str], str]] = ...,
-        reply_to: Optional[Union[List[Optional[str]], str]] = ...,
+        cc: Optional[Sequence[str]] = ...,
+        reply_to: Optional[Sequence[str]] = ...,
     ) -> None: ...
     def get_connection(self, fail_silently: bool = ...) -> Any: ...
     # TODO: when typeshed gets more types for email.Message, move it to MIMEMessage, now it has too many false-positives
     def message(self) -> Any: ...
     def recipients(self) -> List[str]: ...
     def send(self, fail_silently: bool = ...) -> int: ...
-    def attach(
-        self,
-        filename: Optional[Union[MIMEText, str]] = ...,
-        content: Optional[Union[bytes, EmailMessage, SafeMIMEText, str]] = ...,
-        mimetype: Optional[str] = ...,
-    ) -> None: ...
+    @overload
+    def attach(self, filename: MIMEText = ...) -> None: ...
+    @overload
+    def attach(self, filename: None = ..., content: _AttachmentContent = ..., mimetype: str = ...) -> None: ...
+    @overload
+    def attach(self, filename: str = ..., content: _AttachmentContent = ..., mimetype: Optional[str] = ...) -> None: ...
     def attach_file(self, path: str, mimetype: Optional[str] = ...) -> None: ...
 
 class EmailMultiAlternatives(EmailMessage):
     alternative_subtype: str = ...
-    alternatives: Any = ...
+    alternatives: Sequence[Tuple[_AttachmentContent, str]] = ...
     def __init__(
         self,
         subject: str = ...,
         body: str = ...,
         from_email: Optional[str] = ...,
-        to: Optional[List[str]] = ...,
-        bcc: Optional[List[str]] = ...,
+        to: Optional[Sequence[str]] = ...,
+        bcc: Optional[Sequence[str]] = ...,
         connection: Optional[Any] = ...,
-        attachments: None = ...,
+        attachments: Optional[Sequence[Union[MIMEBase, _AttachmentTuple]]] = ...,
         headers: Optional[Dict[str, str]] = ...,
-        alternatives: Optional[List[Tuple[str, str]]] = ...,
-        cc: None = ...,
-        reply_to: None = ...,
+        alternatives: Optional[Sequence[Tuple[_AttachmentContent, str]]] = ...,
+        cc: Optional[Sequence[str]] = ...,
+        reply_to: Optional[Sequence[str]] = ...,
     ) -> None: ...
-    def attach_alternative(self, content: str, mimetype: str) -> None: ...
+    def attach_alternative(self, content: _AttachmentContent, mimetype: str) -> None: ...