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.

.github/ISSUE_TEMPLATE/bug.md

@@ -33,3 +33,4 @@ That is EXTREMELY helpful!
 - `django` version:
 - `mypy` version:
 - `django-stubs` version:
+- `django-stubs-ext` version:

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "02:00"
+  open-pull-requests-limit: 10
+
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "02:00"
+  open-pull-requests-limit: 10

.github/workflows/test.yml

@@ -0,0 +1,107 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./requirements.txt
+
+      - name: Run pre-commit
+        run: pre-commit install && pre-commit run --all-files
+
+  mypy-self-check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./requirements.txt
+
+      - name: Run mypy on plugin code
+        run: mypy --strict mypy_django_plugin
+
+      - name: Run mypy on ext code
+        run: mypy --strict django_stubs_ext
+      - name: Run mypy on scripts and utils
+        run: mypy --strict scripts
+      - name: Run mypy on stubs
+        run: mypy --cache-dir=/dev/null --no-incremental django-stubs
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup system dependencies
+        run: sudo apt-get install binutils libproj-dev gdal-bin
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./requirements.txt
+
+      - name: Run tests
+        run: PYTHONPATH='.' pytest
+
+  typecheck:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.9', '3.10']
+        django-version: ['3.2', '4.0']
+        include:
+          - python-version: '3.7'
+            django-version: '2.2'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup system dependencies
+        run: sudo apt-get install binutils libproj-dev gdal-bin
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./requirements.txt
+
+      - name: Run tests
+        run: python ./scripts/typecheck_tests.py --django_version="${{ matrix.django-version }}"

.gitignore

@@ -1,14 +1,12 @@
 *.egg-info
-__pycache__/
-out/
-/test_sqlite.py
-/django
+.DS_Store
 .idea/
 .mypy_cache/
-build/
-dist/
-pip-wheel-metadata/
 .pytest_cache/
-/.envrc
-/.direnv
-django-sources/
+.venv/
+__pycache__/
+django-source/
+out/
+pip-wheel-metadata/
+stubgen/
+build/

.pre-commit-config.yaml

@@ -0,0 +1,43 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+default_language_version:
+  python: python3.9
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-yaml
+      - id: trailing-whitespace
+      - id: check-executables-have-shebangs
+      - id: debug-statements
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.2.0
+    hooks:
+      - id: pyupgrade
+        args: ["--py37-plus"]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        name: isort (python)
+      - id: isort
+        name: isort (pyi)
+        types: [pyi]
+  - repo: https://github.com/psf/black
+    rev: 22.10.0
+    hooks:
+      - id: black
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8
+
+ci:
+    autofix_commit_msg: '[pre-commit.ci] auto fixes from pre-commit.com hooks'
+    autofix_prs: true
+    autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
+    autoupdate_schedule: weekly
+    skip: [flake8]
+    submodules: false

.travis.yml

@@ -1,52 +0,0 @@
-language: python
-cache: pip
-dist: xenial
-sudo: required
-jobs:
-  include:
-    - name: Run plugin test suite with python 3.7
-      python: 3.7
-      script: 'pytest'
-
-    - name: Typecheck Django 3.0 test suite with python 3.7
-      python: 3.7
-      script: |
-        python ./scripts/typecheck_tests.py --django_version=3.0
-
-    - name: Typecheck Django 3.0 test suite with python 3.6
-      python: 3.6
-      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
-      script: 'mypy ./mypy_django_plugin'
-
-    - name: Lint with black
-      python: 3.7
-      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 --diff'
-
-before_install: |
-  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

CONTRIBUTING.md

@@ -0,0 +1,118 @@
+# Contribution Guide
+
+This project is open source and community driven. As such we encourage code contributions of all kinds. Some areas you can contribute in:
+
+1. Improve the stubs
+2. Sync stubs with the latest version of Django
+3. Improve plugin code and extend its capabilities
+4. Write tests
+5. Update dependencies
+
+## Tutorials
+
+If you want to start working on this project, you will need to get familiar with python typings.
+The Mypy documentation offers an excellent resource for this, as well as the python official documentation:
+
+- [Mypy typing documentation](https://mypy.readthedocs.io/en/stable/#overview-type-system-reference)
+- [Python official typing documentation](https://docs.python.org/3/library/typing.html)
+- [Typing in Python](https://inventwithpython.com/blog/2019/11/24/type-hints-for-busy-python-programmers/) article
+
+Additionally, the following resources might be useful:
+
+- [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
+- [Awesome Python Typing](https://github.com/typeddjango/awesome-python-typing) list
+
+## Dev setup
+
+### Repository Setup
+
+As a first step you will need to fork this repository and clone your fork locally.
+In order to be able to continously sync your fork with the origin repository's master branch, you will need to set up an upstream master. To do so follow this [official github guide](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork).
+
+### Dependency Setup
+
+After your repository is setup you will then need to create and activate a git ignored virtual env, e.g.:
+
+```bash
+python3 -m venv .venv
+source .venv/bin/activate
+```
+
+Then install the dev requirements:
+
+```bash
+pip install -r ./requirements.txt
+```
+
+Finally, install the pre-commit hooks:
+
+```bash
+pre-commit install
+```
+
+### Testing and Linting
+
+We use `mypy`, `pytest`, `flake8`, and `black` for quality control. All tools except pytest are executed using pre-commit when you make a commit.
+To ensure there are not formatting or typing issues in the entire repository you can run:
+
+```bash
+pre-commit run --all-files
+```
+
+NOTE: This command will not only lint but also modify files - so make sure to commit whatever changes you've made before hand.
+You can also run pre-commit per file or for a specific path, simply replace "--all-files" with a target (see [this guide](https://codeburst.io/tool-your-django-project-pre-commit-hooks-e1799d84551f) for more info).
+
+To execute the unit tests, simply run:
+
+```bash
+pytest
+```
+
+If you get some unexpected results or want to be sure that tests run is not affected by previous one, remove `mypy` cache:
+
+```bash
+rm -r .mypy_cache
+```
+
+We also test the stubs against Django's own test suite. This is done in CI but you can also do this locally.
+To execute the script run:
+
+```bash
+python ./scripts/typecheck_tests.py --django_version 3.1
+```
+
+
+### Generating Stubs using Stubgen
+
+The stubs are based on auto-generated code created by Mypy's stubgen tool (see: [the stubgen docs](https://mypy.readthedocs.io/en/stable/stubgen.html)).
+To make life easier we have a helper script that auto generates these stubs. To use it you can run:
+
+```bash
+python ./scripts/stubgen-django.py --django_version 3.1
+```
+
+You can also pass an optional commit hash as a second kwarg to checkout a specific commit, e.g.
+
+```bash
+python ./scripts/stubgen-django.py --django_version 3.1 --commit_sha <commit_sha>
+```
+
+The output for this is a gitignored folder called "stubgen" in the repo's root.
+
+## Submission Guidelines
+
+The workflow for contributions is fairly simple:
+
+1. fork and setup the repository as in the previous step.
+2. create a local branch.
+3. make whatever changes you want to contribute.
+4. ensure your contribution does not introduce linting issues or breaks the tests by linting and testing the code.
+5. make a pull request with an adequate description.
+
+## A Note About Generics
+
+As Django uses a lot of the more dynamic features of Python (i.e. metaobjects), statically typing it requires heavy use of generics. Unfortunately, the syntax for generics is also valid python syntax. For instance, the statement `class SomeClass(SuperType[int])` implicitly translates to `class SomeClass(SuperType.__class_getitem__(int))`. If `SuperType` doesn't define the `__class_getitem__` method, this causes a runtime error, even if the code typechecks.
+
+When adding a new generic class, or changing an existing class to use generics, run a quick test to see if it causes a runtime error. If it does, please add the new generic class to the `_need_generic` list in the [django_stubs_ext monkeypatch function](https://github.com/typeddjango/django-stubs/blob/master/django_stubs_ext/django_stubs_ext/patch.py)

README.md

@@ -1,85 +1,297 @@
 <img src="http://mypy-lang.org/static/mypy_light.svg" alt="mypy logo" width="300px"/>
 
-# pep484 stubs for Django framework
+# pep484 stubs for Django
 
-[![Build Status](https://travis-ci.com/typeddjango/django-stubs.svg?branch=master)](https://travis-ci.com/typeddjango/django-stubs)
+[![Build status](https://github.com/typeddjango/django-stubs/workflows/test/badge.svg?branch=master&event=push)](https://github.com/typeddjango/django-stubs/actions?query=workflow%3Atest)
 [![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)
+[![StackOverflow](https://img.shields.io/stackexchange/stackoverflow/t/django-stubs)](https://stackoverflow.com/questions/tagged/django-stubs)
 
-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.
 
-Could be run on earlier versions of Django, but expect some missing imports warnings.
+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.
 
 
 ## Installation
 
 ```bash
-pip install django-stubs
+pip install django-stubs[compatible-mypy]
 ```
 
-
-## Mypy compatibility
-
-| django-stubs | mypy version | django version | python version
-| ------------ | ---- | ---- | ---- |
-| 1.3.0 | 0.750 | 2.2.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
-
-
-## Configuration
-
 To make mypy aware of the plugin, you need to add
 
 ```ini
 [mypy]
 plugins =
     mypy_django_plugin.main
+
+[mypy.plugins.django-stubs]
+django_settings_module = "myproject.settings"
 ```
 
 in your `mypy.ini` or `setup.cfg` [file](https://mypy.readthedocs.io/en/latest/config_file.html).
 
-Plugin also requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified.
+[pyproject.toml](https://mypy.readthedocs.io/en/stable/config_file.html#using-a-pyproject-toml-file) configurations are also supported:
 
-```ini
-[mypy]
-strict_optional = True
+```toml
+[tool.mypy]
+plugins = ["mypy_django_plugin.main"]
 
-# This one is new:
-[mypy.plugins.django-stubs]
-django_settings_module = mysettings
+[tool.django-stubs]
+django_settings_module = "myproject.settings"
 ```
 
-Where `mysettings` is a value of `DJANGO_SETTINGS_MODULE` (with or without quotes)
+Two things happening here:
 
-Current 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 other words, if your `manage.py runserver` crashes, mypy will crash too. 
+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
 
-## Notes
+We rely on different `django` and `mypy` versions:
 
-Type implementation monkey-patches Django to add `__class_getitem__` to the `Manager` class. 
-If you would use Python3.7 and do that too in your code, you can make things like
+| django-stubs | mypy version | django version | python version
+|--------------| ---- | ---- | ---- |
+| 1.13.0       | 0.980+ | 3.2.x or 4.0.x or 4.1.x | ^3.7
+| 1.12.0       | 0.931+ | 3.2.x or 4.0.x | ^3.7
+| 1.11.0       | 0.931+ | 3.2.x | ^3.7
+| 1.10.0       | 0.931+ | 3.2.x | ^3.7
+| 1.9.0        | 0.910 | 3.2.x | ^3.6
+| 1.8.0        | 0.812 | 3.1.x | ^3.6
+| 1.7.0        | 0.790 | 2.2.x \|\| 3.x | ^3.6
+| 1.6.0        | 0.780 | 2.2.x \|\| 3.x | ^3.6
+| 1.5.0        | 0.770 | 2.2.x \|\| 3.x | ^3.6
+| 1.4.0        | 0.760 | 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 independent 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 can show your support by liking 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
+
+The current implementation uses Django's runtime to extract information about models, so it might crash if your installed apps or `models.py` are broken.
+
+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.
+
+### I cannot use QuerySet or Manager with type annotations
+
+You can get a `TypeError: 'type' object is not subscriptable`
+when you will try to use `QuerySet[MyModel]`, `Manager[MyModel]` or some other Django-based Generic types.
+
+This happens because these Django classes do not support [`__class_getitem__`](https://www.python.org/dev/peps/pep-0560/#class-getitem) magic method in runtime.
+
+1. You can go with our [`django_stubs_ext`](https://github.com/typeddjango/django-stubs/tree/master/django_stubs_ext) helper, that patches all the types we use as Generic in django.
+
+   Install it:
+
+   ```bash
+   pip install django-stubs-ext  # as a production dependency
+   ```
+
+   And then place in your top-level settings:
+
+   ```python
+   import django_stubs_ext
+
+   django_stubs_ext.monkeypatch()
+   ```
+
+   Note: This monkey patching approach will only work when using Python 3.7 and higher, when the `__class_getitem__` magic method was introduced.
+
+   You can add extra types to patch with `django_stubs_ext.monkeypatch(extra_classes=[YourDesiredType])`
+
+2. 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.
+
+### How can I create a HttpRequest that's guaranteed to have an authenticated user?
+
+Django's built in [`HttpRequest`](https://docs.djangoproject.com/en/4.0/ref/request-response/#django.http.HttpRequest) has the attribute `user` that resolves to the type
 
 ```python
-class MyUserManager(models.Manager['MyUser']):
-    pass
+Union[User, AnonymousUser]
+```
+where `User` is the user model specified by the `AUTH_USER_MODEL` setting.
 
-class MyUser(models.Model):
-    objects = MyUserManager()
+If you want a `HttpRequest` that you can type-annotate with where you know that the user is authenticated you can subclass the normal `HttpRequest` class like so:
+
+```python
+from django.http import HttpRequest
+from my_user_app.models import MyUser
+
+
+class AuthenticatedHttpRequest(HttpRequest):
+    user: MyUser
 ```
 
-work, which should make a error messages a bit better. 
+And then use `AuthenticatedHttpRequest` instead of the standard `HttpRequest` for when you know that the user is authenticated. For example in views using the `@login_required` decorator.
+
+
+### My QuerySet methods are returning Any rather than my Model
+
+If you are using `MyQuerySet.as_manager()`:
+
+Example:
+
+```python
+from django.db import models
+
+class MyModelQuerySet(models.QuerySet):
+    pass
+
+
+class MyModel(models.Model):
+    bar = models.IntegerField()
+    objects = MyModelQuerySet.as_manager()
+
+
+def use_my_model() -> int:
+    foo = MyModel.objects.get(id=1) # Should now be `MyModel`
+    return foo.xyz # Gives an error
+```
+
+Or if you're using `Manager.from_queryset`:
+
+Example:
+
+```python
+from django.db import models
+
+
+class MyModelQuerySet(models.QuerySet):
+    pass
+
+
+MyModelManager = models.Manager.from_queryset(MyModelQuerySet)
+
+
+class MyModel(models.Model):
+    bar = models.IntegerField()
+    objects = MyModelManager()
+
+
+def use_my_model() -> int:
+    foo = MyModel.objects.get(id=1) # Should now be `MyModel`
+    return foo.xyz # Gives an error
+```
+
+### Why am I getting incompatible return type errors on my custom managers?
+
+If you declare your custom managers without generics and override built-in
+methods you might see an error message about incompatible error messages,
+something like this:
+
+```python
+from django.db import models
+
+class MyManager(model.Manager):
+    def create(self, **kwargs) -> "MyModel":
+        pass
+```
+
+will cause this error message:
+
+```
+error: Return type "MyModel" of "create" incompatible with return type "_T" in supertype "BaseManager"
+```
+
+This is happening because the `Manager` class is generic, but without
+specifying generics the built-in manager methods are expected to return the
+generic type of the base manager, which is any model. To fix this issue you
+should declare your manager with your model as the type variable:
+
+```python
+class MyManager(models.Manager["MyModel"]):
+    ...
+```
+
+### How do I annotate cases where I called QuerySet.annotate?
+
+Django-stubs provides a special type, `django_stubs_ext.WithAnnotations[Model]`, which indicates that the `Model` has
+been annotated, meaning it allows getting/setting extra attributes on the model instance.
+
+Optionally, you can provide a `TypedDict` of these attributes,
+e.g. `WithAnnotations[MyModel, MyTypedDict]`, to specify which annotated attributes are present.
+
+Currently, the mypy plugin can recognize that specific names were passed to `QuerySet.annotate` and
+include them in the type, but does not record the types of these attributes.
+
+The knowledge of the specific annotated fields is not yet used in creating more specific types for `QuerySet`'s
+`values`, `values_list`, or `filter` methods, however knowledge that the model was annotated _is_ used to create a
+broader type result type for `values`/`values_list`, and to allow `filter`ing on any field.
+
+```python
+from typing import TypedDict
+from django_stubs_ext import WithAnnotations
+from django.db import models
+from django.db.models.expressions import Value
+
+
+class MyModel(models.Model):
+    username = models.CharField(max_length=100)
+
+
+def func(m: WithAnnotations[MyModel]) -> str:
+    return m.asdf  # OK, since the model is annotated as allowing any attribute
+
+
+func(MyModel.objects.annotate(foo=Value("")).get(id=1))  # OK
+func(
+    MyModel.objects.get(id=1)
+)  # Error, since this model will not allow access to any attribute
+
+
+class MyTypedDict(TypedDict):
+    foo: str
+
+
+def func2(m: WithAnnotations[MyModel, MyTypedDict]) -> str:
+    print(m.bar)  # Error, since field "bar" is not in MyModel or MyTypedDict.
+    return m.foo  # OK, since we said field "foo" was allowed
+
+
+func(MyModel.objects.annotate(foo=Value("")).get(id=1))  # OK
+func(MyModel.objects.annotate(bar=Value("")).get(id=1))  # Error
+```
+
+## 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.
 
-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`. 
 
 
 ## To get help
 
 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.
+## Contributing
+
+This project is open source and community driven. As such we encourage contributions big and small. You can contribute by doing any of the following:
+
+1. Contribute code (e.g. improve stubs, add plugin capabilities, write tests etc) - to do so please follow the [contribution guide](./CONTRIBUTING.md).
+2. Assist in code reviews and discussions in issues.
+3. Identify bugs and issues and report these
+4. Ask and answer questions on [StackOverflow](https://stackoverflow.com/questions/tagged/django-stubs)
+
+You can always also reach out in gitter to discuss your contributions!

dev-requirements.txt

@@ -1,8 +0,0 @@
-black
-pytest-mypy-plugins==1.2.0
-psycopg2
-flake8==3.7.9
-flake8-pyi==19.3.0
-isort==4.3.21
-gitpython==3.0.5
--e .

django-stubs/__init__.pyi

@@ -1,12 +1,8 @@
-from typing import Any, NamedTuple
+from typing import Any
+
 from .utils.version import get_version as get_version
 
 VERSION: Any
 __version__: str
 
 def setup(set_prefix: bool = ...) -> None: ...
-
-# Used by mypy_django_plugin when returning a QuerySet row that is a NamedTuple where the field names are unknown
-class _NamedTupleAnyAttr(NamedTuple):
-    def __getattr__(self, item: str) -> Any: ...
-    def __setattr__(self, item: str, value: Any) -> None: ...

django-stubs/apps/__init__.pyi

@@ -1,3 +1,2 @@
 from .config import AppConfig as AppConfig
-
 from .registry import apps as apps

django-stubs/apps/config.pyi

@@ -1,20 +1,22 @@
-from typing import Any, Iterator, Type, Optional, Dict
+import types
+from typing import Dict, Iterator, Optional, Type
 
 from django.apps.registry import Apps
 from django.db.models.base import Model
+from django.utils.functional import _StrOrPromise
 
 MODELS_MODULE_NAME: str
 
 class AppConfig:
     name: str = ...
-    module: Optional[Any] = ...
+    module: Optional[types.ModuleType] = ...
     apps: Optional[Apps] = ...
     label: str = ...
-    verbose_name: str = ...
+    verbose_name: _StrOrPromise = ...
     path: str = ...
     models_module: Optional[str] = ...
     models: Dict[str, Type[Model]] = ...
-    def __init__(self, app_name: str, app_module: Optional[Any]) -> None: ...
+    def __init__(self, app_name: str, app_module: Optional[types.ModuleType]) -> None: ...
     @classmethod
     def create(cls, entry: str) -> AppConfig: ...
     def get_model(self, model_name: str, require_ready: bool = ...) -> Type[Model]: ...

django-stubs/conf/__init__.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.utils.functional import LazyObject
 
@@ -6,24 +6,34 @@ from django.utils.functional import LazyObject
 from . import global_settings
 
 ENVIRONMENT_VARIABLE: str = ...
-DEFAULT_CONTENT_TYPE_DEPRECATED_MSG: str = ...
-FILE_CHARSET_DEPRECATED_MSG: str = ...
+PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG: str = ...
+DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG: str = ...
 
 # required for plugin to be able to distinguish this specific instance of LazySettings from others
 class _DjangoConfLazyObject(LazyObject):
     def __getattr__(self, item: Any) -> Any: ...
 
 class LazySettings(_DjangoConfLazyObject):
-    configured: bool
-    def configure(self, default_settings: Any = ..., **options: Any) -> Any: ...
+    SETTINGS_MODULE: str
+    @property
+    def configured(self) -> bool: ...
+    def configure(self, default_settings: Any = ..., **options: Any) -> None: ...
 
 settings: LazySettings = ...
 
 class Settings:
-    def __init__(self, settings_module: str): ...
+    SETTINGS_MODULE: str
+    def __init__(self, settings_module: str) -> None: ...
     def is_overridden(self, setting: str) -> bool: ...
 
-class UserSettingsHolder: ...
+class UserSettingsHolder:
+    SETTINGS_MODULE: None = ...
+    def __init__(self, default_settings: Any) -> None: ...
+    def __getattr__(self, name: str) -> Any: ...
+    def __setattr__(self, name: str, value: Any) -> None: ...
+    def __delattr__(self, name: str) -> None: ...
+    def is_overridden(self, setting: str) -> bool: ...
 
 class SettingsReference(str):
+    def __new__(self, value: Any, setting_name: str) -> SettingsReference: ...
     def __init__(self, value: str, setting_name: str) -> None: ...

django-stubs/conf/global_settings.pyi

@@ -7,6 +7,8 @@ by the DJANGO_SETTINGS_MODULE environment variable.
 # django.utils.translation -- that module depends on the settings.
 from typing import Any, Dict, List, Optional, Pattern, Protocol, Sequence, Tuple, Union
 
+from typing_extensions import Literal
+
 ####################
 # CORE             #
 ####################
@@ -68,15 +70,11 @@ USE_L10N: bool = ...
 # notifications and other various emails.
 MANAGERS = ADMINS
 
-# Default content type and charset to use for all HttpResponse objects, if a
+# Default charset to use for all HttpResponse objects, if a
 # MIME type isn't manually specified. These are used to construct the
 # Content-Type header.
-DEFAULT_CONTENT_TYPE: str = ...
 DEFAULT_CHARSET: str = ...
 
-# Encoding of files read from disk (template and initial SQL files).
-FILE_CHARSET: str = ...
-
 # Email address that error messages come from.
 SERVER_EMAIL: str = ...
 
@@ -85,7 +83,7 @@ DATABASES: Dict[str, Dict[str, Any]] = ...
 
 # Classes used to implement DB routing behavior.
 class Router(Protocol):
-    def allow_migrate(self, db, app_label, **hints): ...
+    def allow_migrate(self, db: str, app_label: str, **hints: Any) -> Optional[bool]: ...
 
 DATABASE_ROUTERS: List[Union[str, Router]] = ...
 
@@ -136,7 +134,7 @@ APPEND_SLASH: bool = ...
 PREPEND_WWW: bool = ...
 
 # Override the server-derived value of SCRIPT_NAME
-FORCE_SCRIPT_NAME = None
+FORCE_SCRIPT_NAME: Optional[str] = ...
 
 # List of compiled regular expression objects representing User-Agent strings
 # that are not allowed to visit any page, systemwide. Use this for bad
@@ -148,7 +146,7 @@ FORCE_SCRIPT_NAME = None
 #         re.compile(r'^SiteSucker.*'),
 #         re.compile(r'^sohu-search'),
 #     ]
-DISALLOWED_USER_AGENTS: List[Pattern] = ...
+DISALLOWED_USER_AGENTS: List[Pattern[str]] = ...
 
 ABSOLUTE_URL_OVERRIDES: Dict[str, Any] = ...
 
@@ -162,7 +160,7 @@ ABSOLUTE_URL_OVERRIDES: Dict[str, Any] = ...
 #        re.compile(r'^/phpmyadmin/'),
 #        re.compile(r'\.(cgi|php|pl)$'),
 #    ]
-IGNORABLE_404_URLS: List[Pattern] = ...
+IGNORABLE_404_URLS: List[Pattern[str]] = ...
 
 # A secret key for this particular Django installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Django will complain
@@ -210,12 +208,12 @@ FILE_UPLOAD_TEMP_DIR: Optional[str] = ...
 
 # The numeric mode to set newly-uploaded files to. The value should be a mode
 # you'd pass directly to os.chmod; see https://docs.python.org/library/os.html#files-and-directories.
-FILE_UPLOAD_PERMISSIONS = None
+FILE_UPLOAD_PERMISSIONS: int = ...
 
 # The numeric mode to assign to newly-created directories, when uploading files.
 # The value should be a mode as you'd pass to os.chmod;
 # see https://docs.python.org/library/os.html#files-and-directories.
-FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
+FILE_UPLOAD_DIRECTORY_PERMISSIONS: Optional[int] = ...
 
 # Python module path where user will place custom format definition.
 # The directory where this setting is pointing should contain subdirectories
@@ -330,33 +328,33 @@ MIDDLEWARE: List[str] = ...
 ############
 
 # Cache to store session data if using the cache session backend.
-SESSION_CACHE_ALIAS = "default"
+SESSION_CACHE_ALIAS: str = ...
 # Cookie name. This can be whatever you want.
-SESSION_COOKIE_NAME = "sessionid"
+SESSION_COOKIE_NAME: str = ...
 # Age of cookie, in seconds (default: 2 weeks).
-SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2
+SESSION_COOKIE_AGE: int = ...
 # A string like "example.com", or None for standard domain cookie.
 SESSION_COOKIE_DOMAIN: Optional[str] = ...
 # Whether the session cookie should be secure (https:// only).
-SESSION_COOKIE_SECURE = False
+SESSION_COOKIE_SECURE: bool = ...
 # The path of the session cookie.
-SESSION_COOKIE_PATH = "/"
+SESSION_COOKIE_PATH: str = ...
 # Whether to use the non-RFC standard httpOnly flag (IE, FF3+, others)
-SESSION_COOKIE_HTTPONLY = True
+SESSION_COOKIE_HTTPONLY: bool = ...
 # 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: Optional[str] = ...
+# This can be 'Lax', 'Strict', 'None', or False to disable the flag.
+SESSION_COOKIE_SAMESITE: Literal["Lax", "Strict", "None", False] = ...
 # Whether to save the session data on every request.
-SESSION_SAVE_EVERY_REQUEST = False
+SESSION_SAVE_EVERY_REQUEST: bool = ...
 # Whether a user's session cookie expires when the Web browser is closed.
-SESSION_EXPIRE_AT_BROWSER_CLOSE = False
+SESSION_EXPIRE_AT_BROWSER_CLOSE: bool = ...
 # The module to store session data
-SESSION_ENGINE = "django.contrib.sessions.backends.db"
+SESSION_ENGINE: str = ...
 # Directory to store session files if using the file session module. If None,
 # the backend will use a sensible default.
 SESSION_FILE_PATH: Optional[str] = ...
 # class to serialize session data
-SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"
+SESSION_SERIALIZER: str = ...
 
 #########
 # CACHE #
@@ -364,9 +362,9 @@ SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"
 
 # The cache backends to use.
 CACHES: Dict[str, Dict[str, Any]] = ...
-CACHE_MIDDLEWARE_KEY_PREFIX = ""
-CACHE_MIDDLEWARE_SECONDS = 600
-CACHE_MIDDLEWARE_ALIAS = "default"
+CACHE_MIDDLEWARE_KEY_PREFIX: str = ...
+CACHE_MIDDLEWARE_SECONDS: int = ...
+CACHE_MIDDLEWARE_ALIAS: str = ...
 
 ##################
 # AUTHENTICATION #
@@ -376,14 +374,14 @@ AUTH_USER_MODEL: str = ...
 
 AUTHENTICATION_BACKENDS: Sequence[str] = ...
 
-LOGIN_URL = "/accounts/login/"
+LOGIN_URL: str = ...
 
 LOGIN_REDIRECT_URL: str = ...
 
 LOGOUT_REDIRECT_URL: Optional[str] = ...
 
 # The number of days a password reset link is valid for
-PASSWORD_RESET_TIMEOUT_DAYS = 3
+PASSWORD_RESET_TIMEOUT_DAYS: int = ...
 
 # the first hasher in this list is the preferred algorithm.  any
 # password using different algorithms will be converted automatically
@@ -396,7 +394,7 @@ AUTH_PASSWORD_VALIDATORS: List[Dict[str, str]] = ...
 # SIGNING #
 ###########
 
-SIGNING_BACKEND = "django.core.signing.TimestampSigner"
+SIGNING_BACKEND: str = ...
 
 ########
 # CSRF #
@@ -404,26 +402,26 @@ SIGNING_BACKEND = "django.core.signing.TimestampSigner"
 
 # Dotted path to callable to be used as view when a request is
 # rejected by the CSRF middleware.
-CSRF_FAILURE_VIEW = "django.views.csrf.csrf_failure"
+CSRF_FAILURE_VIEW: str = ...
 
 # Settings for CSRF cookie.
-CSRF_COOKIE_NAME = "csrftoken"
-CSRF_COOKIE_AGE = 60 * 60 * 24 * 7 * 52
-CSRF_COOKIE_DOMAIN = None
-CSRF_COOKIE_PATH = "/"
-CSRF_COOKIE_SECURE = False
-CSRF_COOKIE_HTTPONLY = False
-CSRF_COOKIE_SAMESITE: Optional[str] = ...
-CSRF_HEADER_NAME = "HTTP_X_CSRFTOKEN"
+CSRF_COOKIE_NAME: str = ...
+CSRF_COOKIE_AGE: int = ...
+CSRF_COOKIE_DOMAIN: Optional[str] = ...
+CSRF_COOKIE_PATH: str = ...
+CSRF_COOKIE_SECURE: bool = ...
+CSRF_COOKIE_HTTPONLY: bool = ...
+CSRF_COOKIE_SAMESITE: Literal["Lax", "Strict", "None", False] = ...
+CSRF_HEADER_NAME: str = ...
 CSRF_TRUSTED_ORIGINS: List[str] = ...
-CSRF_USE_SESSIONS = False
+CSRF_USE_SESSIONS: bool = ...
 
 ############
 # MESSAGES #
 ############
 
 # Class to use as messages backend
-MESSAGE_STORAGE = "django.contrib.messages.storage.fallback.FallbackStorage"
+MESSAGE_STORAGE: str = ...
 
 # Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
 # django.contrib.messages to avoid imports in this settings file.
@@ -433,21 +431,21 @@ MESSAGE_STORAGE = "django.contrib.messages.storage.fallback.FallbackStorage"
 ###########
 
 # The callable to use to configure logging
-LOGGING_CONFIG = "logging.config.dictConfig"
+LOGGING_CONFIG: str = ...
 
 # Custom logging configuration.
 LOGGING: Dict[str, Any] = ...
 
 # Default exception reporter filter class used in case none has been
 # specifically assigned to the HttpRequest instance.
-DEFAULT_EXCEPTION_REPORTER_FILTER = "django.views.debug.SafeExceptionReporterFilter"
+DEFAULT_EXCEPTION_REPORTER_FILTER: str = ...
 
 ###########
 # TESTING #
 ###########
 
 # The name of the class to use to run the test suite
-TEST_RUNNER = "django.test.runner.DiscoverRunner"
+TEST_RUNNER: str = ...
 
 # Apps that don't need to be serialized at test database creation time
 # (only apps with migrations are to start with)
@@ -494,11 +492,11 @@ SILENCED_SYSTEM_CHECKS: List[str] = ...
 #######################
 # SECURITY MIDDLEWARE #
 #######################
-SECURE_BROWSER_XSS_FILTER = False
-SECURE_CONTENT_TYPE_NOSNIFF = False
-SECURE_HSTS_INCLUDE_SUBDOMAINS = False
-SECURE_HSTS_PRELOAD = False
-SECURE_HSTS_SECONDS = 0
+SECURE_BROWSER_XSS_FILTER: bool = ...
+SECURE_CONTENT_TYPE_NOSNIFF: bool = ...
+SECURE_HSTS_INCLUDE_SUBDOMAINS: bool = ...
+SECURE_HSTS_PRELOAD: bool = ...
+SECURE_HSTS_SECONDS: int = ...
 SECURE_REDIRECT_EXEMPT: List[str] = ...
-SECURE_SSL_HOST = None
-SECURE_SSL_REDIRECT = False
+SECURE_SSL_HOST: Optional[str] = ...
+SECURE_SSL_REDIRECT: bool = ...

django-stubs/conf/locale/__init__.pyi

@@ -1,3 +1,3 @@
-from typing import Dict, Any
+from typing import Any, Dict
 
 LANG_INFO: Dict[str, Any] = ...

django-stubs/conf/urls/__init__.pyi

@@ -1,25 +1,30 @@
 # Stubs for django.conf.urls (Python 3.5)
-from typing import Any, Callable, Dict, List, Optional, overload, Tuple, Union
+from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Union, overload
 
 from django.http.response import HttpResponse, HttpResponseBase
+from django.urls import URLPattern, URLResolver
+from django.urls import include as include
 
-from django.urls import URLResolver, URLPattern
+handler400: Union[str, Callable[..., HttpResponse]] = ...
+handler403: Union[str, Callable[..., HttpResponse]] = ...
+handler404: Union[str, Callable[..., HttpResponse]] = ...
+handler500: Union[str, Callable[..., HttpResponse]] = ...
 
-handler400: Callable[..., HttpResponse] = ...
-handler403: Callable[..., HttpResponse] = ...
-handler404: Callable[..., HttpResponse] = ...
-handler500: Callable[..., HttpResponse] = ...
+IncludedURLConf = Tuple[Sequence[Union[URLResolver, URLPattern]], Optional[str], Optional[str]]
 
-IncludedURLConf = Tuple[List[URLResolver], Optional[str], Optional[str]]
-
-def include(arg: Any, namespace: str = ..., app_name: str = ...) -> IncludedURLConf: ...
+# Deprecated
 @overload
 def url(
-    regex: str, view: Callable[..., HttpResponseBase], kwargs: Dict[str, Any] = ..., name: str = ...
+    regex: str, view: Callable[..., HttpResponseBase], kwargs: Optional[Dict[str, Any]] = ..., name: Optional[str] = ...
 ) -> URLPattern: ...
 @overload
-def url(regex: str, view: IncludedURLConf, kwargs: Dict[str, Any] = ..., name: str = ...) -> URLResolver: ...
+def url(
+    regex: str, view: IncludedURLConf, kwargs: Optional[Dict[str, Any]] = ..., name: Optional[str] = ...
+) -> URLResolver: ...
 @overload
 def url(
-    regex: str, view: List[Union[URLResolver, str]], kwargs: Dict[str, Any] = ..., name: str = ...
+    regex: str,
+    view: Sequence[Union[URLResolver, str]],
+    kwargs: Optional[Dict[str, Any]] = ...,
+    name: Optional[str] = ...,
 ) -> URLResolver: ...

django-stubs/conf/urls/i18n.pyi

@@ -1,8 +1,8 @@
-from typing import Any, List, Tuple, Callable
+from typing import List, Tuple
 
-from django.urls.resolvers import URLPattern
+from django.urls import _AnyURL
 
-def i18n_patterns(*urls: Any, prefix_default_language: bool = ...) -> List[List[URLPattern]]: ...
+def i18n_patterns(*urls: _AnyURL, prefix_default_language: bool = ...) -> List[_AnyURL]: ...
 def is_language_prefix_patterns_used(urlconf: str) -> Tuple[bool, bool]: ...
 
-urlpatterns: List[Callable]
+urlpatterns: List[_AnyURL]

django-stubs/contrib/admin/__init__.pyi

@@ -1,24 +1,23 @@
-from .decorators import register as register
-from .filters import (
-    AllValuesFieldListFilter as AllValuesFieldListFilter,
-    BooleanFieldListFilter as BooleanFieldListFilter,
-    ChoicesFieldListFilter as ChoicesFieldListFilter,
-    DateFieldListFilter as DateFieldListFilter,
-    FieldListFilter as FieldListFilter,
-    ListFilter as ListFilter,
-    RelatedFieldListFilter as RelatedFieldListFilter,
-    RelatedOnlyFieldListFilter as RelatedOnlyFieldListFilter,
-    SimpleListFilter as SimpleListFilter,
-)
-from .helpers import ACTION_CHECKBOX_NAME as ACTION_CHECKBOX_NAME
-from .options import (
-    HORIZONTAL as HORIZONTAL,
-    VERTICAL as VERTICAL,
-    ModelAdmin as ModelAdmin,
-    StackedInline as StackedInline,
-    TabularInline as TabularInline,
-)
-from .sites import AdminSite as AdminSite, site as site
 from . import checks as checks
+from .decorators import action as action
+from .decorators import display as display
+from .decorators import register as register
+from .filters import AllValuesFieldListFilter as AllValuesFieldListFilter
+from .filters import BooleanFieldListFilter as BooleanFieldListFilter
+from .filters import ChoicesFieldListFilter as ChoicesFieldListFilter
+from .filters import DateFieldListFilter as DateFieldListFilter
+from .filters import EmptyFieldListFilter as EmptyFieldListFilter
+from .filters import FieldListFilter as FieldListFilter
+from .filters import ListFilter as ListFilter
+from .filters import RelatedFieldListFilter as RelatedFieldListFilter
+from .filters import RelatedOnlyFieldListFilter as RelatedOnlyFieldListFilter
+from .filters import SimpleListFilter as SimpleListFilter
+from .options import HORIZONTAL as HORIZONTAL
+from .options import VERTICAL as VERTICAL
+from .options import ModelAdmin as ModelAdmin
+from .options import StackedInline as StackedInline
+from .options import TabularInline as TabularInline
+from .sites import AdminSite as AdminSite
+from .sites import site as site
 
 def autodiscover() -> None: ...

django-stubs/contrib/admin/actions.pyi

@@ -1,8 +1,8 @@
 from typing import Optional
 
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.query import QuerySet
+from django.http.request import HttpRequest
 from django.template.response import TemplateResponse
 
-def delete_selected(modeladmin: ModelAdmin, request: WSGIRequest, queryset: QuerySet) -> Optional[TemplateResponse]: ...
+def delete_selected(modeladmin: ModelAdmin, request: HttpRequest, queryset: QuerySet) -> Optional[TemplateResponse]: ...

django-stubs/contrib/admin/checks.pyi

@@ -1,21 +1,21 @@
-from typing import Any, List, Union, Iterable, Optional
-
-from django.contrib.admin.options import BaseModelAdmin
-from django.core.checks.messages import Error
+from typing import Any, List, Optional, Sequence
 
 from django.apps.config import AppConfig
+from django.contrib.admin.options import BaseModelAdmin
+from django.core.checks.messages import CheckMessage, Error
 
-_CheckError = Union[str, Error]
-
-def check_admin_app(app_configs: Optional[Iterable[AppConfig]], **kwargs: Any) -> List[_CheckError]: ...
-def check_dependencies(**kwargs: Any) -> List[_CheckError]: ...
+def check_admin_app(app_configs: Optional[Sequence[AppConfig]], **kwargs: Any) -> List[CheckMessage]: ...
+def check_dependencies(**kwargs: Any) -> List[CheckMessage]: ...
 
 class BaseModelAdminChecks:
-    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> List[_CheckError]: ...
+    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> List[CheckMessage]: ...
 
-class ModelAdminChecks(BaseModelAdminChecks): ...
-class InlineModelAdminChecks(BaseModelAdminChecks): ...
+class ModelAdminChecks(BaseModelAdminChecks):
+    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> List[CheckMessage]: ...
 
-def must_be(type: Any, option: Any, obj: Any, id: Any): ...
-def must_inherit_from(parent: Any, option: Any, obj: Any, id: Any): ...
-def refer_to_missing_field(field: Any, option: Any, model: Any, obj: Any, id: Any): ...
+class InlineModelAdminChecks(BaseModelAdminChecks):
+    def check(self, inline_obj: BaseModelAdmin, **kwargs: Any) -> List[CheckMessage]: ...  # type: ignore
+
+def must_be(type: Any, option: Any, obj: Any, id: Any) -> List[CheckMessage]: ...
+def must_inherit_from(parent: Any, option: Any, obj: Any, id: Any) -> List[CheckMessage]: ...
+def refer_to_missing_field(field: Any, option: Any, obj: Any, id: Any) -> List[CheckMessage]: ...

django-stubs/contrib/admin/decorators.pyi

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

django-stubs/contrib/admin/exceptions.pyi

@@ -0,0 +1,4 @@
+from django.core.exceptions import SuspiciousOperation as SuspiciousOperation
+
+class DisallowedModelAdminLookup(SuspiciousOperation): ...
+class DisallowedModelAdminToField(SuspiciousOperation): ...

django-stubs/contrib/admin/filters.pyi

@@ -1,39 +1,39 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Iterator
+from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Tuple, Type
 
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
+from django.db.models.fields import Field
 from django.db.models.fields.related import RelatedField
 from django.db.models.query import QuerySet
-
-from django.db.models.fields import Field
+from django.http.request import HttpRequest
 
 class ListFilter:
-    title: Any = ...
+    title: str = ...
     template: str = ...
     used_parameters: Any = ...
     def __init__(
-        self, request: WSGIRequest, params: Dict[str, str], model: Type[Model], model_admin: ModelAdmin
+        self, request: HttpRequest, params: Dict[str, str], model: Type[Model], model_admin: ModelAdmin
     ) -> None: ...
     def has_output(self) -> bool: ...
-    def choices(self, changelist: Any) -> Optional[Iterator[Dict[str, Any]]]: ...
-    def queryset(self, request: Any, queryset: QuerySet) -> Optional[QuerySet]: ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
+    def queryset(self, request: HttpRequest, queryset: QuerySet) -> Optional[QuerySet]: ...
     def expected_parameters(self) -> Optional[List[str]]: ...
 
 class SimpleListFilter(ListFilter):
-    parameter_name: Any = ...
+    parameter_name: str = ...
     lookup_choices: Any = ...
     def value(self) -> Optional[str]: ...
-    def lookups(self, request: Any, model_admin: Any) -> List[Tuple[Any, str]]: ...
+    def lookups(self, request: HttpRequest, model_admin: ModelAdmin) -> Optional[Iterable[Tuple[Any, str]]]: ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
 
 class FieldListFilter(ListFilter):
     field: Field = ...
-    field_path: Any = ...
-    title: Any = ...
+    field_path: str = ...
+    title: str = ...
     def __init__(
         self,
         field: Field,
-        request: WSGIRequest,
+        request: HttpRequest,
         params: Dict[str, str],
         model: Type[Model],
         model_admin: ModelAdmin,
@@ -45,7 +45,7 @@ class FieldListFilter(ListFilter):
     def create(
         cls,
         field: Field,
-        request: WSGIRequest,
+        request: HttpRequest,
         params: Dict[str, str],
         model: Type[Model],
         model_admin: ModelAdmin,
@@ -56,32 +56,34 @@ class RelatedFieldListFilter(FieldListFilter):
     used_parameters: Dict[Any, Any]
     lookup_kwarg: str = ...
     lookup_kwarg_isnull: str = ...
-    lookup_val: None = ...
-    lookup_val_isnull: None = ...
+    lookup_val: Any = ...
+    lookup_val_isnull: Any = ...
     lookup_choices: Any = ...
-    lookup_title: Any = ...
+    lookup_title: str = ...
     title: str = ...
     empty_value_display: Any = ...
     @property
     def include_empty_choice(self) -> bool: ...
     def field_choices(
-        self, field: RelatedField, request: WSGIRequest, model_admin: ModelAdmin
+        self, field: RelatedField, request: HttpRequest, model_admin: ModelAdmin
     ) -> List[Tuple[str, str]]: ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
 
 class BooleanFieldListFilter(FieldListFilter):
-    lookup_kwarg: Any = ...
-    lookup_kwarg2: Any = ...
+    lookup_kwarg: str = ...
+    lookup_kwarg2: str = ...
     lookup_val: Any = ...
     lookup_val2: Any = ...
-    def choices(self, changelist: Any) -> None: ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
 
 class ChoicesFieldListFilter(FieldListFilter):
     title: str
     used_parameters: Dict[Any, Any]
     lookup_kwarg: str = ...
     lookup_kwarg_isnull: str = ...
-    lookup_val: None = ...
-    lookup_val_isnull: None = ...
+    lookup_val: Any = ...
+    lookup_val_isnull: Any = ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
 
 class DateFieldListFilter(FieldListFilter):
     field_generic: Any = ...
@@ -90,21 +92,28 @@ class DateFieldListFilter(FieldListFilter):
     lookup_kwarg_until: Any = ...
     links: Any = ...
     lookup_kwarg_isnull: Any = ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
 
 class AllValuesFieldListFilter(FieldListFilter):
     title: str
     used_parameters: Dict[Any, Any]
     lookup_kwarg: str = ...
     lookup_kwarg_isnull: str = ...
-    lookup_val: None = ...
-    lookup_val_isnull: None = ...
+    lookup_val: Any = ...
+    lookup_val_isnull: Any = ...
     empty_value_display: str = ...
     lookup_choices: QuerySet = ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...
 
 class RelatedOnlyFieldListFilter(RelatedFieldListFilter):
     lookup_kwarg: str
     lookup_kwarg_isnull: str
-    lookup_val: None
-    lookup_val_isnull: None
+    lookup_val: Any
+    lookup_val_isnull: Any
     title: str
     used_parameters: Dict[Any, Any]
+
+class EmptyFieldListFilter(FieldListFilter):
+    lookup_kwarg: str = ...
+    lookup_val: Any = ...
+    def choices(self, changelist: Any) -> Iterator[Dict[str, Any]]: ...

django-stubs/contrib/admin/helpers.pyi

@@ -1,13 +1,16 @@
-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.utils import ErrorDict
-from django.forms.widgets import Media, Widget
-from django.utils.safestring import SafeText
+from typing import Any, Callable, Dict, Iterable, Iterator, List, Mapping, Optional, Sequence, Tuple, Union
 
 from django import forms
+from django.contrib.admin.options import ModelAdmin
+from django.db.models import Model
 from django.db.models.fields import AutoField
+from django.forms import BaseForm
+from django.forms.boundfield import BoundField
+from django.forms.models import ModelForm
+from django.forms.utils import ErrorDict, ErrorList
+from django.forms.widgets import Media, Widget
+from django.utils.safestring import SafeString
+from typing_extensions import TypedDict
 
 ACTION_CHECKBOX_NAME: str
 
@@ -17,99 +20,121 @@ class ActionForm(forms.Form):
 
 checkbox: Any
 
+class _PrepopulatedDict(TypedDict):
+    field: BoundField
+    dependencies: List[BoundField]
+
 class AdminForm:
-    prepopulated_fields: Any = ...
-    model_admin: Any = ...
-    readonly_fields: Any = ...
+    prepopulated_fields: List[_PrepopulatedDict]
+    model_admin: Optional[ModelAdmin] = ...
+    readonly_fields: Sequence[str] = ...
+    form: ModelForm
+    fieldsets: List[Tuple[Any, Dict[str, List[str]]]]
     def __init__(
         self,
-        form: AdminPasswordChangeForm,
-        fieldsets: List[Tuple[None, Dict[str, List[str]]]],
-        prepopulated_fields: Dict[Any, Any],
-        readonly_fields: Optional[Iterable[Any]] = ...,
-        model_admin: Any = ...,
+        form: ModelForm,
+        fieldsets: List[Tuple[Any, Dict[str, List[str]]]],
+        prepopulated_fields: Mapping[str, Iterable[str]],
+        readonly_fields: Optional[Sequence[str]] = ...,
+        model_admin: Optional[ModelAdmin] = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Fieldset]: ...
     @property
     def errors(self) -> ErrorDict: ...
     @property
-    def non_field_errors(self) -> Callable: ...
+    def non_field_errors(self) -> Callable[[], ErrorList]: ...
     @property
     def media(self) -> Media: ...
 
 class Fieldset:
-    form: Any = ...
-    classes: Any = ...
-    description: Any = ...
-    model_admin: Any = ...
-    readonly_fields: Any = ...
+    form: ModelForm = ...
+    classes: str = ...
+    description: Optional[str] = ...
+    model_admin: Optional[ModelAdmin] = ...
+    readonly_fields: Sequence[str] = ...
     def __init__(
         self,
-        form: Any,
+        form: ModelForm,
         name: Optional[Any] = ...,
-        readonly_fields: Optional[Iterable[Any]] = ...,
-        fields: Any = ...,
-        classes: Any = ...,
-        description: Optional[Any] = ...,
-        model_admin: Optional[Any] = ...,
+        readonly_fields: Sequence[str] = ...,
+        fields: Sequence[str] = ...,
+        classes: Iterable[str] = ...,
+        description: Optional[str] = ...,
+        model_admin: Optional[ModelAdmin] = ...,
     ) -> None: ...
     @property
     def media(self) -> Media: ...
     def __iter__(self) -> Iterator[Fieldline]: ...
 
 class Fieldline:
-    form: Any = ...
-    fields: Any = ...
-    has_visible_field: Any = ...
-    model_admin: Any = ...
-    readonly_fields: Any = ...
+    form: ModelForm = ...
+    fields: Sequence[str] = ...
+    has_visible_field: bool = ...
+    model_admin: Optional[ModelAdmin] = ...
+    readonly_fields: Sequence[str] = ...
     def __init__(
-        self, form: Any, field: Any, readonly_fields: Optional[Iterable[Any]] = ..., model_admin: Optional[Any] = ...
+        self,
+        form: ModelForm,
+        field: Union[str, Sequence[str]],
+        readonly_fields: Optional[Sequence[str]] = ...,
+        model_admin: Optional[ModelAdmin] = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Union[AdminField, AdminReadonlyField]]: ...
-    def errors(self) -> SafeText: ...
+    def errors(self) -> SafeString: ...
 
 class AdminField:
     field: BoundField = ...
     is_first: bool = ...
     is_checkbox: bool = ...
     is_readonly: bool = ...
-    def __init__(self, form: Any, field: Any, is_first: Any) -> None: ...
-    def label_tag(self) -> SafeText: ...
-    def errors(self) -> SafeText: ...
+    def __init__(self, form: ModelForm, field: str, is_first: bool) -> None: ...
+    def label_tag(self) -> SafeString: ...
+    def errors(self) -> SafeString: ...
+
+class _FieldDictT(TypedDict):
+    name: str
+    label: str
+    help_text: str
+    field: Union[Callable[[Model], Any], str]
 
 class AdminReadonlyField:
-    field: Any = ...
-    form: Any = ...
-    model_admin: Any = ...
-    is_first: Any = ...
+    field: _FieldDictT = ...
+    form: ModelForm = ...
+    model_admin: Optional[ModelAdmin] = ...
+    is_first: bool = ...
     is_checkbox: bool = ...
     is_readonly: bool = ...
     empty_value_display: Any = ...
-    def __init__(self, form: Any, field: Any, is_first: Any, model_admin: Optional[Any] = ...) -> None: ...
-    def label_tag(self) -> SafeText: ...
-    def contents(self) -> SafeText: ...
+    def __init__(
+        self,
+        form: ModelForm,
+        field: Union[Callable[[Model], Any], str],
+        is_first: bool,
+        model_admin: Optional[ModelAdmin] = ...,
+    ) -> None: ...
+    def label_tag(self) -> SafeString: ...
+    def contents(self) -> SafeString: ...
 
 class InlineAdminFormSet:
     opts: Any = ...
     formset: Any = ...
     fieldsets: Any = ...
-    model_admin: Any = ...
-    readonly_fields: Any = ...
-    prepopulated_fields: Any = ...
-    classes: Any = ...
-    has_add_permission: Any = ...
-    has_change_permission: Any = ...
-    has_delete_permission: Any = ...
-    has_view_permission: Any = ...
+    model_admin: Optional[ModelAdmin] = ...
+    readonly_fields: Sequence[str] = ...
+    prepopulated_fields: Dict[str, Any] = ...
+    classes: str = ...
+    has_add_permission: bool = ...
+    has_change_permission: bool = ...
+    has_delete_permission: bool = ...
+    has_view_permission: bool = ...
     def __init__(
         self,
         inline: Any,
         formset: Any,
         fieldsets: Any,
-        prepopulated_fields: Optional[Any] = ...,
-        readonly_fields: Optional[Any] = ...,
-        model_admin: Optional[Any] = ...,
+        prepopulated_fields: Optional[Dict[str, Any]] = ...,
+        readonly_fields: Optional[Sequence[str]] = ...,
+        model_admin: Optional[ModelAdmin] = ...,
         has_add_permission: bool = ...,
         has_change_permission: bool = ...,
         has_delete_permission: bool = ...,
@@ -119,37 +144,38 @@ class InlineAdminFormSet:
     def fields(self) -> Iterator[Dict[str, Union[Dict[str, bool], bool, Widget, str]]]: ...
     def inline_formset_data(self) -> str: ...
     @property
-    def forms(self): ...
+    def forms(self) -> List[BaseForm]: ...
     @property
-    def non_form_errors(self) -> Callable: ...
+    def non_form_errors(self) -> Callable[[], ErrorList]: ...
     @property
     def media(self) -> Media: ...
 
 class InlineAdminForm(AdminForm):
     formset: Any = ...
-    original: Any = ...
-    show_url: Any = ...
-    absolute_url: Any = ...
+    original: Optional[bool] = ...
+    show_url: bool = ...
+    absolute_url: Optional[str] = ...
     def __init__(
         self,
         formset: Any,
-        form: Any,
+        form: ModelForm,
         fieldsets: Any,
         prepopulated_fields: Any,
-        original: Any,
-        readonly_fields: Optional[Any] = ...,
-        model_admin: Optional[Any] = ...,
-        view_on_site_url: Optional[Any] = ...,
+        original: Optional[bool],
+        readonly_fields: Optional[Sequence[str]] = ...,
+        model_admin: Optional[ModelAdmin] = ...,
+        view_on_site_url: Optional[str] = ...,
     ) -> None: ...
+    def __iter__(self) -> Iterator[InlineFieldset]: ...
     def needs_explicit_pk_field(self) -> Union[bool, AutoField]: ...
     def pk_field(self) -> AdminField: ...
     def fk_field(self) -> AdminField: ...
     def deletion_field(self) -> AdminField: ...
-    def ordering_field(self): ...
 
 class InlineFieldset(Fieldset):
     formset: Any = ...
     def __init__(self, formset: Any, *args: Any, **kwargs: Any) -> None: ...
+    def __iter__(self) -> Iterator[Fieldline]: ...
 
 class AdminErrorList(forms.utils.ErrorList):
-    def __init__(self, form: Any, inline_formsets: Any) -> None: ...
+    def __init__(self, form: ModelForm, inline_formsets: Any) -> None: ...

django-stubs/contrib/admin/models.pyi

@@ -2,9 +2,8 @@ from typing import Any, Optional, Union
 from uuid import UUID
 
 from django.contrib.contenttypes.models import ContentType
-from django.db.models.base import Model
-
 from django.db import models
+from django.db.models.base import Model
 
 ADDITION: int
 CHANGE: int

django-stubs/contrib/admin/options.pyi

@@ -1,33 +1,62 @@
-from collections import OrderedDict
-from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Generic,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    Type,
+    TypeVar,
+    Union,
+)
 
-from django.contrib.admin.filters import ListFilter
+from django import forms
+from django.contrib.admin.filters import FieldListFilter, ListFilter
 from django.contrib.admin.models import LogEntry
 from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.contrib.contenttypes.models import ContentType
-from django.core.checks.messages import Error
+from django.core.checks.messages import CheckMessage
 from django.core.paginator import Paginator
 from django.db.models.base import Model
+from django.db.models.fields import Field
 from django.db.models.fields.related import ForeignKey, ManyToManyField, RelatedField
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
+from django.forms.fields import Field as FormField
 from django.forms.fields import TypedChoiceField
-from django.forms.models import ModelChoiceField, ModelMultipleChoiceField
+from django.forms.forms import BaseForm
+from django.forms.formsets import BaseFormSet
+from django.forms.models import (
+    BaseInlineFormSet,
+    BaseModelFormSet,
+    ModelChoiceField,
+    ModelForm,
+    ModelMultipleChoiceField,
+)
 from django.forms.widgets import Media
 from django.http.request import HttpRequest
-from django.http.response import HttpResponse, HttpResponseBase, HttpResponseRedirect, JsonResponse
-from django.template.response import TemplateResponse
+from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
+from django.template.response import _TemplateForResponseT
 from django.urls.resolvers import URLPattern
-from django.utils.safestring import SafeText
-
-from django.db.models.fields import Field
+from django.utils.datastructures import _ListOrTuple
+from django.utils.functional import _StrOrPromise
+from django.utils.safestring import SafeString
+from typing_extensions import Literal, TypedDict
 
 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,107 +66,142 @@ class IncorrectLookupParameters(Exception): ...
 FORMFIELD_FOR_DBFIELD_DEFAULTS: Any
 csrf_protect_m: Any
 
-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 = ...
-    view_on_site: bool = ...
+_FieldGroups = Sequence[Union[str, Sequence[str]]]
+
+class _OptionalFieldOpts(TypedDict, total=False):
+    classes: Sequence[str]
+    description: str
+
+class _FieldOpts(_OptionalFieldOpts, total=True):
+    fields: _FieldGroups
+
+# Workaround for mypy issue, a Sequence type should be preferred here.
+# https://github.com/python/mypy/issues/8921
+# _FieldsetSpec = Sequence[Tuple[Optional[str], _FieldOpts]]
+_FieldsetSpec = _ListOrTuple[Tuple[Optional[str], _FieldOpts]]
+_ListFilterT = Union[
+    Type[ListFilter],
+    Field,
+    str,
+    Tuple[Union[Field, str], Type[FieldListFilter]],
+    List[Union[Field, str, Type[FieldListFilter]]],
+]
+
+# Generic type specifically for models, for use in BaseModelAdmin and subclasses
+# https://github.com/typeddjango/django-stubs/issues/482
+_ModelT = TypeVar("_ModelT", bound=Model)
+
+class BaseModelAdmin(Generic[_ModelT]):
+    autocomplete_fields: Sequence[str] = ...
+    raw_id_fields: Sequence[str] = ...
+    fields: Optional[_FieldGroups] = ...
+    exclude: Optional[Sequence[str]] = ...
+    fieldsets: Optional[_FieldsetSpec] = ...
+    form: Type[forms.ModelForm[_ModelT]] = ...
+    filter_vertical: Sequence[str] = ...
+    filter_horizontal: Sequence[str] = ...
+    radio_fields: Mapping[str, _Direction] = ...
+    prepopulated_fields: Dict[str, Sequence[str]] = ...
+    formfield_overrides: Mapping[Type[Field], Mapping[str, Any]] = ...
+    readonly_fields: Sequence[str] = ...
+    ordering: Optional[Sequence[str]] = ...
+    sortable_by: Optional[_ListOrTuple[str]] = ...
+    view_on_site: Union[bool, Callable[[_ModelT], str]] = ...
     show_full_result_count: bool = ...
     checks_class: Any = ...
-    def check(self, **kwargs: Any) -> List[Union[str, Error]]: ...
-    def formfield_for_dbfield(
-        self, db_field: Field, request: Optional[HttpRequest], **kwargs: Any
-    ) -> Optional[Field]: ...
-    def formfield_for_choice_field(
-        self, db_field: Field, request: Optional[HttpRequest], **kwargs: Any
-    ) -> TypedChoiceField: ...
+    model: Type[_ModelT]
+    opts: Options[_ModelT]
+    admin_site: AdminSite
+    def __init__(self) -> None: ...
+    def check(self, **kwargs: Any) -> List[CheckMessage]: ...
+    def formfield_for_dbfield(self, db_field: Field, request: HttpRequest, **kwargs: Any) -> Optional[FormField]: ...
+    def formfield_for_choice_field(self, db_field: Field, request: HttpRequest, **kwargs: Any) -> TypedChoiceField: ...
     def get_field_queryset(
-        self, db: None, db_field: RelatedField, request: Optional[HttpRequest]
+        self, db: Optional[str], db_field: RelatedField, request: HttpRequest
     ) -> Optional[QuerySet]: ...
     def formfield_for_foreignkey(
-        self, db_field: ForeignKey, request: Optional[HttpRequest], **kwargs: Any
-    ) -> Optional[ModelChoiceField]: ...
+        self, db_field: ForeignKey, request: HttpRequest, **kwargs: Any
+    ) -> ModelChoiceField: ...
     def formfield_for_manytomany(
-        self, db_field: ManyToManyField, request: Optional[HttpRequest], **kwargs: Any
-    ) -> ModelMultipleChoiceField: ...
-    def get_autocomplete_fields(self, request: HttpRequest) -> Tuple: ...
-    def get_view_on_site_url(self, obj: Optional[Model] = ...) -> Optional[str]: ...
-    def get_empty_value_display(self) -> SafeText: ...
-    def get_exclude(self, request: HttpRequest, obj: Optional[Model] = ...) -> Any: ...
-    def get_fields(self, request: HttpRequest, obj: Optional[Model] = ...) -> Sequence[Union[Callable, str]]: ...
-    def get_fieldsets(
-        self, request: HttpRequest, obj: Optional[Model] = ...
-    ) -> List[Tuple[Optional[str], Dict[str, Any]]]: ...
-    def get_ordering(self, request: HttpRequest) -> Union[List[str], Tuple]: ...
-    def get_readonly_fields(self, request: HttpRequest, obj: Optional[Model] = ...) -> Union[List[str], Tuple]: ...
-    def get_prepopulated_fields(self, request: HttpRequest, obj: Optional[Model] = ...) -> Dict[str, Tuple[str]]: ...
-    def get_queryset(self, request: HttpRequest) -> QuerySet: ...
-    def get_sortable_by(self, request: HttpRequest) -> Union[List[Callable], List[str], Tuple]: ...
+        self, db_field: ManyToManyField, request: HttpRequest, **kwargs: Any
+    ) -> Optional[ModelMultipleChoiceField]: ...
+    def get_autocomplete_fields(self, request: HttpRequest) -> Sequence[str]: ...
+    def get_view_on_site_url(self, obj: Optional[_ModelT] = ...) -> Optional[str]: ...
+    def get_empty_value_display(self) -> SafeString: ...
+    def get_exclude(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Optional[Sequence[str]]: ...
+    def get_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> _FieldGroups: ...
+    def get_fieldsets(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> _FieldsetSpec: ...
+    def get_inlines(self, request: HttpRequest, obj: Optional[_ModelT]) -> List[Type[InlineModelAdmin]]: ...
+    def get_ordering(self, request: HttpRequest) -> Sequence[str]: ...
+    def get_readonly_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Sequence[str]: ...
+    def get_prepopulated_fields(
+        self, request: HttpRequest, obj: Optional[_ModelT] = ...
+    ) -> Dict[str, Sequence[str]]: ...
+    def get_queryset(self, request: HttpRequest) -> QuerySet[_ModelT]: ...
+    def get_sortable_by(self, request: HttpRequest) -> Sequence[str]: ...
     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) -> 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_change_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
+    def has_delete_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
+    def has_view_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
+    def has_view_or_change_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
     def has_module_permission(self, request: HttpRequest) -> bool: ...
 
-class ModelAdmin(BaseModelAdmin):
-    list_display: Sequence[Union[str, Callable]] = ...
-    list_display_links: Optional[Sequence[Union[str, Callable]]] = ...
-    list_filter: Sequence[Union[str, Type[ListFilter], Tuple[str, Type[ListFilter]]]] = ...
+_DisplayT = _ListOrTuple[Union[str, Callable[[_ModelT], str]]]
+
+class ModelAdmin(BaseModelAdmin[_ModelT]):
+    list_display: _DisplayT = ...
+    list_display_links: Optional[_DisplayT] = ...
+    list_filter: _ListOrTuple[_ListFilterT] = ...
     list_select_related: Union[bool, Sequence[str]] = ...
     list_per_page: int = ...
     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: Optional[_TemplateForResponseT] = ...
+    change_form_template: Optional[_TemplateForResponseT] = ...
+    change_list_template: Optional[_TemplateForResponseT] = ...
+    delete_confirmation_template: Optional[_TemplateForResponseT] = ...
+    delete_selected_confirmation_template: Optional[_TemplateForResponseT] = ...
+    object_history_template: Optional[_TemplateForResponseT] = ...
+    popup_response_template: Optional[_TemplateForResponseT] = ...
+    actions: Optional[Sequence[Union[Callable[[ModelAdmin, HttpRequest, QuerySet], None], str]]] = ...
     action_form: Any = ...
     actions_on_top: bool = ...
     actions_on_bottom: bool = ...
     actions_selection_counter: bool = ...
-    model: Type[Model] = ...
-    opts: Options = ...
+    model: Type[_ModelT] = ...
+    opts: Options[_ModelT] = ...
     admin_site: AdminSite = ...
-    def __init__(self, model: Type[Model], admin_site: Optional[AdminSite]) -> None: ...
-    def get_inline_instances(self, request: HttpRequest, obj: Optional[Model] = ...) -> List[InlineModelAdmin]: ...
+    def __init__(self, model: Type[_ModelT], admin_site: AdminSite) -> None: ...
+    def get_inline_instances(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> List[InlineModelAdmin]: ...
     def get_urls(self) -> List[URLPattern]: ...
     @property
     def urls(self) -> List[URLPattern]: ...
     @property
     def media(self) -> Media: ...
     def get_model_perms(self, request: HttpRequest) -> Dict[str, bool]: ...
-    def get_form(self, request: Any, obj: Optional[Any] = ..., change: bool = ..., **kwargs: Any): ...
+    def get_form(
+        self, request: HttpRequest, obj: Optional[_ModelT] = ..., change: bool = ..., **kwargs: Any
+    ) -> Type[forms.ModelForm[_ModelT]]: ...
     def get_changelist(self, request: HttpRequest, **kwargs: Any) -> Type[ChangeList]: ...
     def get_changelist_instance(self, request: HttpRequest) -> ChangeList: ...
-    def get_object(self, request: HttpRequest, object_id: str, from_field: None = ...) -> Optional[Model]: ...
-    def get_changelist_form(self, request: Any, **kwargs: Any): ...
-    def get_changelist_formset(self, request: Any, **kwargs: Any): ...
-    def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[Model] = ...) -> Iterator[Any]: ...
+    def get_object(
+        self, request: HttpRequest, object_id: str, from_field: Optional[str] = ...
+    ) -> Optional[_ModelT]: ...
+    def get_changelist_form(self, request: HttpRequest, **kwargs: Any) -> Type[ModelForm[_ModelT]]: ...
+    def get_changelist_formset(
+        self, request: HttpRequest, **kwargs: Any
+    ) -> Type[BaseModelFormSet[_ModelT, ModelForm[_ModelT]]]: ...
+    def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Iterator[Any]: ...
     def get_paginator(
         self,
         request: HttpRequest,
@@ -146,28 +210,28 @@ class ModelAdmin(BaseModelAdmin):
         orphans: int = ...,
         allow_empty_first_page: bool = ...,
     ) -> Paginator: ...
-    def log_addition(self, request: HttpRequest, object: Model, message: Any) -> LogEntry: ...
-    def log_change(self, request: HttpRequest, object: Model, message: Any) -> LogEntry: ...
-    def log_deletion(self, request: HttpRequest, object: Model, object_repr: str) -> LogEntry: ...
-    def action_checkbox(self, obj: Model) -> SafeText: ...
-    def get_actions(self, request: HttpRequest) -> OrderedDict: ...
+    def log_addition(self, request: HttpRequest, object: _ModelT, message: Any) -> LogEntry: ...
+    def log_change(self, request: HttpRequest, object: _ModelT, message: Any) -> LogEntry: ...
+    def log_deletion(self, request: HttpRequest, object: _ModelT, object_repr: str) -> LogEntry: ...
+    def action_checkbox(self, obj: _ModelT) -> SafeString: ...
+    def get_actions(self, request: HttpRequest) -> Dict[str, Optional[Tuple[Callable[..., str], str, str]]]: ...
     def get_action_choices(
         self, request: HttpRequest, default_choices: List[Tuple[str, str]] = ...
     ) -> List[Tuple[str, str]]: ...
-    def get_action(self, action: Union[Callable, str]) -> Tuple[Callable, str, str]: ...
-    def get_list_display(self, request: HttpRequest) -> Sequence[str]: ...
-    def get_list_display_links(self, request: HttpRequest, list_display: Sequence[str]) -> Optional[Sequence[str]]: ...
-    def get_list_filter(self, request: HttpRequest) -> Sequence[str]: ...
-    def get_list_select_related(self, request: HttpRequest) -> Sequence[str]: ...
-    def get_search_fields(self, request: HttpRequest) -> List[str]: ...
+    def get_action(self, action: Union[Callable, str]) -> Optional[Tuple[Callable[..., str], str, str]]: ...
+    def get_list_display(self, request: HttpRequest) -> _DisplayT: ...
+    def get_list_display_links(self, request: HttpRequest, list_display: _DisplayT) -> _DisplayT: ...
+    def get_list_filter(self, request: HttpRequest) -> Sequence[_ListFilterT]: ...
+    def get_list_select_related(self, request: HttpRequest) -> Union[bool, Sequence[str]]: ...
+    def get_search_fields(self, request: HttpRequest) -> Sequence[str]: ...
     def get_search_results(
         self, request: HttpRequest, queryset: QuerySet, search_term: str
-    ) -> Tuple[QuerySet, bool]: ...
+    ) -> Tuple[QuerySet[_ModelT], bool]: ...
     def get_preserved_filters(self, request: HttpRequest) -> str: ...
     def _get_edited_object_pks(self, request: HttpRequest, prefix: str) -> List[str]: ...
-    def _get_list_editable_queryset(self, request: HttpRequest, prefix: str) -> QuerySet: ...
+    def _get_list_editable_queryset(self, request: HttpRequest, prefix: str) -> QuerySet[_ModelT]: ...
     def construct_change_message(
-        self, request: HttpRequest, form: AdminPasswordChangeForm, formsets: None, add: bool = ...
+        self, request: HttpRequest, form: AdminPasswordChangeForm, formsets: Iterable[BaseFormSet], add: bool = ...
     ) -> List[Dict[str, Dict[str, List[str]]]]: ...
     def message_user(
         self,
@@ -177,79 +241,96 @@ class ModelAdmin(BaseModelAdmin):
         extra_tags: str = ...,
         fail_silently: bool = ...,
     ) -> None: ...
-    def save_form(self, request: Any, form: Any, change: Any): ...
-    def save_model(self, request: Any, obj: Any, form: Any, change: Any) -> None: ...
-    def delete_model(self, request: HttpRequest, obj: Model) -> None: ...
+    def save_form(self, request: HttpRequest, form: Any, change: Any) -> Any: ...
+    def save_model(self, request: HttpRequest, obj: _ModelT, form: Any, change: Any) -> None: ...
+    def delete_model(self, request: HttpRequest, obj: _ModelT) -> None: ...
     def delete_queryset(self, request: HttpRequest, queryset: QuerySet) -> None: ...
-    def save_formset(self, request: Any, form: Any, formset: Any, change: Any) -> None: ...
-    def save_related(self, request: Any, form: Any, formsets: Any, change: Any) -> None: ...
+    def save_formset(self, request: HttpRequest, form: Any, formset: Any, change: Any) -> None: ...
+    def save_related(self, request: HttpRequest, form: Any, formsets: Any, change: Any) -> None: ...
     def render_change_form(
         self,
-        request: Any,
-        context: Any,
+        request: HttpRequest,
+        context: Dict[str, Any],
         add: bool = ...,
         change: bool = ...,
         form_url: str = ...,
-        obj: Optional[Any] = ...,
-    ): ...
-    def response_add(
-        self, request: HttpRequest, obj: Model, post_url_continue: Optional[str] = ...
+        obj: Optional[_ModelT] = ...,
     ) -> HttpResponse: ...
-    def response_change(self, request: HttpRequest, obj: Model) -> HttpResponse: ...
-    def response_post_save_add(self, request: HttpRequest, obj: Model) -> HttpResponseRedirect: ...
-    def response_post_save_change(self, request: HttpRequest, obj: Model) -> HttpResponseRedirect: ...
-    def response_action(self, request: HttpRequest, queryset: QuerySet) -> Optional[HttpResponseBase]: ...
+    def response_add(
+        self, request: HttpRequest, obj: _ModelT, post_url_continue: Optional[str] = ...
+    ) -> HttpResponse: ...
+    def response_change(self, request: HttpRequest, obj: _ModelT) -> HttpResponse: ...
+    def response_post_save_add(self, request: HttpRequest, obj: _ModelT) -> HttpResponseRedirect: ...
+    def response_post_save_change(self, request: HttpRequest, obj: _ModelT) -> HttpResponseRedirect: ...
+    # Probably FileResponse cannot come from ModelAdmin views
+    def response_action(self, request: HttpRequest, queryset: QuerySet) -> Optional[HttpResponse]: ...
     def response_delete(self, request: HttpRequest, obj_display: str, obj_id: int) -> HttpResponse: ...
-    def render_delete_form(self, request: Any, context: Any): ...
+    def render_delete_form(self, request: HttpRequest, context: Dict[str, Any]) -> HttpResponse: ...
     def get_inline_formsets(
-        self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[Model] = ...
+        self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[_ModelT] = ...
     ) -> List[Any]: ...
-    def get_changeform_initial_data(self, request: HttpRequest) -> Dict[str, str]: ...
+    def get_changeform_initial_data(self, request: HttpRequest) -> Dict[str, Union[str, List[str]]]: ...
     def changeform_view(
         self,
         request: HttpRequest,
         object_id: Optional[str] = ...,
         form_url: str = ...,
-        extra_context: Optional[Dict[str, bool]] = ...,
-    ) -> Any: ...
-    def autocomplete_view(self, request: HttpRequest) -> JsonResponse: ...
-    def add_view(self, request: HttpRequest, form_url: str = ..., extra_context: None = ...) -> HttpResponse: ...
-    def change_view(
-        self, request: HttpRequest, object_id: str, form_url: str = ..., extra_context: Optional[Dict[str, bool]] = ...
+        extra_context: Optional[Dict[str, Any]] = ...,
     ) -> HttpResponse: ...
-    def changelist_view(
-        self, request: HttpRequest, extra_context: Optional[Dict[str, str]] = ...
-    ) -> TemplateResponse: ...
+    def add_view(
+        self, request: HttpRequest, form_url: str = ..., extra_context: Optional[Dict[str, Any]] = ...
+    ) -> HttpResponse: ...
+    def change_view(
+        self, request: HttpRequest, object_id: str, form_url: str = ..., extra_context: Optional[Dict[str, Any]] = ...
+    ) -> HttpResponse: ...
+    def changelist_view(self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
     def get_deleted_objects(
-        self, objs: QuerySet, request: HttpRequest
-    ) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
-    def delete_view(self, request: HttpRequest, object_id: str, extra_context: None = ...) -> Any: ...
-    def history_view(self, request: HttpRequest, object_id: str, extra_context: None = ...) -> HttpResponse: ...
+        self, objs: Union[Sequence[_ModelT], QuerySet[_ModelT]], request: HttpRequest
+    ) -> Tuple[List[Model], Dict[str, int], Set[str], List[str]]: ...
+    def delete_view(
+        self, request: HttpRequest, object_id: str, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> HttpResponse: ...
+    def history_view(
+        self, request: HttpRequest, object_id: str, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> HttpResponse: ...
 
-class InlineModelAdmin(BaseModelAdmin):
-    model: Any = ...
-    fk_name: Any = ...
-    formset: Any = ...
+_ChildModelT = TypeVar("_ChildModelT", bound=Model)
+_ParentModelT = TypeVar("_ParentModelT", bound=Model)
+
+class InlineModelAdmin(Generic[_ChildModelT, _ParentModelT], BaseModelAdmin[_ChildModelT]):
+    model: Type[_ChildModelT] = ...
+    fk_name: Optional[str] = ...
+    formset: Type[BaseInlineFormSet[_ChildModelT, _ParentModelT, forms.ModelForm[_ChildModelT]]] = ...
     extra: int = ...
     min_num: Optional[int] = ...
     max_num: Optional[int] = ...
     template: str = ...
-    verbose_name: Optional[str] = ...
-    verbose_name_plural: Optional[str] = ...
+    verbose_name: Optional[_StrOrPromise] = ...
+    verbose_name_plural: Optional[_StrOrPromise] = ...
     can_delete: bool = ...
     show_change_link: bool = ...
-    classes: Any = ...
-    admin_site: Any = ...
-    parent_model: Any = ...
-    opts: Any = ...
-    has_registered_model: Any = ...
-    def __init__(self, parent_model: Union[Type[Model], Model], admin_site: AdminSite) -> None: ...
+    classes: Optional[Sequence[str]] = ...
+    admin_site: AdminSite = ...
+    parent_model: Type[_ParentModelT] = ...
+    opts: Options[_ChildModelT] = ...
+    has_registered_model: bool = ...
+    def __init__(self, parent_model: Type[_ParentModelT], admin_site: AdminSite) -> None: ...
     @property
     def media(self) -> Media: ...
-    def get_extra(self, request: HttpRequest, obj: Optional[Model] = ..., **kwargs: Any) -> int: ...
-    def get_min_num(self, request: HttpRequest, obj: Optional[Model] = ..., **kwargs: Any) -> Optional[int]: ...
-    def get_max_num(self, request: HttpRequest, obj: Optional[Model] = ..., **kwargs: Any) -> Optional[int]: ...
-    def get_formset(self, request: Any, obj: Optional[Any] = ..., **kwargs: Any): ...
+    def get_extra(self, request: HttpRequest, obj: Optional[_ParentModelT] = ..., **kwargs: Any) -> int: ...
+    def get_min_num(self, request: HttpRequest, obj: Optional[_ParentModelT] = ..., **kwargs: Any) -> Optional[int]: ...
+    def get_max_num(self, request: HttpRequest, obj: Optional[_ParentModelT] = ..., **kwargs: Any) -> Optional[int]: ...
+    def get_formset(
+        self, request: HttpRequest, obj: Optional[_ParentModelT] = ..., **kwargs: Any
+    ) -> Type[BaseInlineFormSet[_ChildModelT, _ParentModelT, forms.ModelForm[_ChildModelT]]]: ...
+    def get_queryset(self, request: HttpRequest) -> QuerySet[_ChildModelT]: ...
+    def has_add_permission(self, request: HttpRequest, obj: Optional[_ParentModelT]) -> bool: ...  # type: ignore
+    def has_change_permission(self, request: HttpRequest, obj: Optional[_ParentModelT] = ...) -> bool: ...  # type: ignore
+    def has_delete_permission(self, request: HttpRequest, obj: Optional[_ParentModelT] = ...) -> bool: ...  # type: ignore
+    def has_view_permission(self, request: HttpRequest, obj: Optional[_ParentModelT] = ...) -> bool: ...  # type: ignore
 
-class StackedInline(InlineModelAdmin): ...
-class TabularInline(InlineModelAdmin): ...
+class StackedInline(InlineModelAdmin[_ChildModelT, _ParentModelT]):
+    template: str = ...
+
+class TabularInline(InlineModelAdmin[_ChildModelT, _ParentModelT]):
+    template: str = ...

django-stubs/contrib/admin/sites.pyi

@@ -1,36 +1,54 @@
+import sys
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
 
+from django.apps.config import AppConfig
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
+from django.contrib.auth.forms import AuthenticationForm
+from django.core.checks import CheckMessage
 from django.db.models.base import Model
+from django.db.models.query import QuerySet
+from django.http.request import HttpRequest
 from django.http.response import HttpResponse
 from django.template.response import TemplateResponse
-from django.urls.resolvers import URLResolver
-from django.utils.functional import LazyObject
+from django.urls import URLPattern, URLResolver
+from django.utils.functional import LazyObject, _StrOrPromise
 
-from django.apps.config import AppConfig
+if sys.version_info >= (3, 9):
+    from weakref import WeakSet
 
-all_sites: Any
+    all_sites: WeakSet[AdminSite]
+else:
+    from typing import MutableSet
+
+    all_sites: MutableSet[AdminSite]
+
+_ActionCallback = Callable[[ModelAdmin, HttpRequest, QuerySet], Optional[TemplateResponse]]
 
 class AlreadyRegistered(Exception): ...
 class NotRegistered(Exception): ...
 
 class AdminSite:
-    site_title: Any = ...
-    site_header: Any = ...
-    index_title: Any = ...
+    site_title: str = ...
+    site_header: str = ...
+    index_title: str = ...
     site_url: str = ...
-    login_form: Any = ...
-    index_template: Any = ...
-    app_index_template: Any = ...
-    login_template: Any = ...
-    logout_template: Any = ...
-    password_change_template: Any = ...
-    password_change_done_template: Any = ...
+    login_form: Optional[Type[AuthenticationForm]] = ...
+    index_template: Optional[str] = ...
+    app_index_template: Optional[str] = ...
+    login_template: Optional[str] = ...
+    logout_template: Optional[str] = ...
+    password_change_template: Optional[str] = ...
+    password_change_done_template: Optional[str] = ...
     name: str = ...
+    enable_nav_sidebar: bool = ...
+    empty_value_display: str = ...
+    final_catch_all_view: bool = ...
+    _empty_value_display: str = ...
     _registry: Dict[Type[Model], ModelAdmin]
+    _global_actions: Dict[str, _ActionCallback]
+    _actions: Dict[str, _ActionCallback]
     def __init__(self, name: str = ...) -> None: ...
-    def check(self, app_configs: Optional[Iterable[AppConfig]]) -> List[Any]: ...
+    def check(self, app_configs: Optional[Iterable[AppConfig]]) -> List[CheckMessage]: ...
     def register(
         self,
         model_or_iterable: Union[Type[Model], Iterable[Type[Model]]],
@@ -39,36 +57,35 @@ class AdminSite:
     ) -> None: ...
     def unregister(self, model_or_iterable: Union[Type[Model], Iterable[Type[Model]]]) -> None: ...
     def is_registered(self, model: Type[Model]) -> bool: ...
-    def add_action(self, action: Callable, name: Optional[str] = ...) -> None: ...
+    def add_action(self, action: _ActionCallback, name: Optional[str] = ...) -> None: ...
     def disable_action(self, name: str) -> None: ...
     def get_action(self, name: str) -> Callable: ...
     @property
-    def actions(self): ...
-    @property
-    def empty_value_display(self): ...
-    @empty_value_display.setter
-    def empty_value_display(self, empty_value_display: Any) -> None: ...
-    def has_permission(self, request: WSGIRequest) -> bool: ...
+    def actions(self) -> Iterable[Tuple[str, _ActionCallback]]: ...
+    def has_permission(self, request: HttpRequest) -> bool: ...
     def admin_view(self, view: Callable, cacheable: bool = ...) -> Callable: ...
-    def get_urls(self) -> List[URLResolver]: ...
+    def get_urls(self) -> List[Union[URLResolver, URLPattern]]: ...
     @property
-    def urls(self) -> Tuple[List[URLResolver], str, str]: ...
-    def each_context(self, request: Any): ...
+    def urls(self) -> Tuple[List[Union[URLResolver, URLPattern]], str, str]: ...
+    def each_context(self, request: HttpRequest) -> Dict[str, Any]: ...
     def password_change(
-        self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...
+        self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...
     ) -> TemplateResponse: ...
     def password_change_done(
-        self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...
+        self, request: HttpRequest, 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: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
-    def login(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
-    def get_app_list(self, request: WSGIRequest) -> List[Any]: ...
-    def index(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
+    def i18n_javascript(self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
+    def logout(self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
+    def login(self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
+    def _build_app_dict(self, request: HttpRequest, label: Optional[_StrOrPromise] = ...) -> Dict[str, Any]: ...
+    def get_app_list(self, request: HttpRequest) -> List[Any]: ...
+    def index(self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
     def app_index(
-        self, request: WSGIRequest, app_label: str, extra_context: Optional[Dict[str, Any]] = ...
+        self, request: HttpRequest, app_label: str, extra_context: Optional[Dict[str, Any]] = ...
     ) -> TemplateResponse: ...
+    def autocomplete_view(self, request: HttpRequest) -> HttpResponse: ...
+    def catch_all_view(self, request: HttpRequest, url: str) -> HttpResponse: ...
 
 class DefaultAdminSite(LazyObject): ...
 
-site: Any
+site: AdminSite

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

@@ -1,28 +1,29 @@
-from typing import Any, Dict, Iterator, List, Optional, Union, Iterable
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Union
 
 from django.contrib.admin.filters import FieldListFilter
 from django.contrib.admin.templatetags.base import InclusionAdminNode
 from django.contrib.admin.views.main import ChangeList
 from django.db.models.base import Model
 from django.forms.boundfield import BoundField
+from django.forms.models import ModelForm
 from django.template.base import Parser, Token
 from django.template.context import RequestContext
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeString
 
 from .base import InclusionAdminNode
 
 register: Any
 DOT: str
 
-def paginator_number(cl: ChangeList, i: int) -> SafeText: ...
-def pagination(cl: ChangeList) -> Dict[str, Iterable[Any]]: ...
+def paginator_number(cl: ChangeList, i: int) -> SafeString: ...
+def pagination(cl: ChangeList) -> Dict[str, Any]: ...
 def pagination_tag(parser: Parser, token: Token) -> InclusionAdminNode: ...
 def result_headers(cl: ChangeList) -> Iterator[Dict[str, Optional[Union[int, str]]]]: ...
-def items_for_result(cl: ChangeList, result: Model, form: None) -> Iterator[SafeText]: ...
+def items_for_result(cl: ChangeList, result: Model, form: Optional[ModelForm]) -> Iterator[SafeString]: ...
 
 class ResultList(list):
-    form: None = ...
-    def __init__(self, form: None, *items: Any) -> None: ...
+    form: Optional[ModelForm] = ...
+    def __init__(self, form: Optional[ModelForm], *items: Any) -> None: ...
 
 def results(cl: ChangeList) -> Iterator[ResultList]: ...
 def result_hidden_fields(cl: ChangeList) -> Iterator[BoundField]: ...
@@ -36,7 +37,7 @@ def date_hierarchy(cl: ChangeList) -> Optional[Dict[str, Any]]: ...
 def date_hierarchy_tag(parser: Parser, token: Token) -> InclusionAdminNode: ...
 def search_form(cl: ChangeList) -> Dict[str, Union[bool, ChangeList, str]]: ...
 def search_form_tag(parser: Parser, token: Token) -> InclusionAdminNode: ...
-def admin_list_filter(cl: ChangeList, spec: FieldListFilter) -> SafeText: ...
+def admin_list_filter(cl: ChangeList, spec: FieldListFilter) -> SafeString: ...
 def admin_actions(context: RequestContext) -> RequestContext: ...
 def admin_actions_tag(parser: Parser, token: Token) -> InclusionAdminNode: ...
 def change_list_object_tools_tag(parser: Parser, token: Token) -> InclusionAdminNode: ...

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

@@ -1,5 +0,0 @@
-from typing import Any
-
-register: Any
-
-def static(path: str) -> str: ...

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

@@ -3,11 +3,11 @@ from uuid import UUID
 
 from django.db.models.options import Options
 from django.template.context import RequestContext
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeString
 
 register: Any
 
-def admin_urlname(value: Options, arg: SafeText) -> str: ...
+def admin_urlname(value: Options, arg: SafeString) -> str: ...
 def admin_urlquote(value: Union[int, str, UUID]) -> Union[int, str, UUID]: ...
 def add_preserved_filters(
     context: Union[Dict[str, Union[Options, str]], RequestContext],

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

@@ -3,15 +3,15 @@ from typing import Any, Callable, Dict, List
 from django.template.base import Parser, Token
 from django.template.context import Context
 from django.template.library import InclusionNode
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeString
 
 class InclusionAdminNode(InclusionNode):
     args: List[Any]
     func: Callable
-    kwargs: Dict[Any, Any]
+    kwargs: Dict[str, Any]
     takes_context: bool
     template_name: str = ...
     def __init__(
         self, parser: Parser, token: Token, func: Callable, template_name: str, takes_context: bool = ...
     ) -> None: ...
-    def render(self, context: Context) -> SafeText: ...
+    def render(self, context: Context) -> SafeString: ...

django-stubs/contrib/admin/tests.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from contextlib import contextmanager
+from typing import Any, Callable, Generator
 
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from django.test.selenium import SeleniumTestCase
@@ -8,16 +9,18 @@ class CSPMiddleware(MiddlewareMixin): ...
 
 class AdminSeleniumTestCase(SeleniumTestCase, StaticLiveServerTestCase):
     def wait_until(self, callback: Callable, timeout: int = ...) -> None: ...
-    def wait_for_popup(self, num_windows: int = ..., timeout: int = ...) -> None: ...
+    def wait_for_and_switch_to_popup(self, num_windows: int = ..., timeout: int = ...) -> None: ...
     def wait_for(self, css_selector: str, timeout: int = ...) -> None: ...
     def wait_for_text(self, css_selector: str, text: str, timeout: int = ...) -> None: ...
     def wait_for_value(self, css_selector: str, text: str, timeout: int = ...) -> None: ...
     def wait_until_visible(self, css_selector: str, timeout: int = ...) -> None: ...
     def wait_until_invisible(self, css_selector: str, timeout: int = ...) -> None: ...
-    def wait_page_loaded(self) -> None: ...
+    def wait_page_ready(self, timeout: int = ...) -> None: ...
+    @contextmanager
+    def wait_page_loaded(self, timeout: int = ...) -> Generator[None, None, None]: ...
     def admin_login(self, username: str, password: str, login_url: str = ...) -> None: ...
-    def get_css_value(self, selector: str, attribute: str) -> Any: ...
-    def get_select_option(self, selector: str, value: Any) -> Any: ...
+    def select_option(self, selector: str, value: Any) -> None: ...
+    def deselect_option(self, selector: str, value: Any) -> None: ...
     def assertSelectOptions(self, selector: str, values: Any) -> None: ...
     def assertSelectedOptions(self, selector: str, values: Any) -> None: ...
     def has_css_class(self, selector: str, klass: str) -> bool: ...

django-stubs/contrib/admin/utils.pyi

@@ -1,35 +1,35 @@
-import collections
-from datetime import datetime
-from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Type, Union
+import datetime
+from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Set, Tuple, Type, Union, overload
 from uuid import UUID
 
 from django.contrib.admin.options import BaseModelAdmin
 from django.contrib.admin.sites import AdminSite
 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.reverse_related import ManyToOneRel
+from django.db.models.fields import Field, reverse_related
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
 from django.forms.forms import BaseForm
-
-from django.db.models.fields import Field, reverse_related
+from django.forms.formsets import BaseFormSet
+from django.http.request import HttpRequest
+from django.utils.datastructures import _IndexableCollection
+from typing_extensions import Literal, TypedDict
 
 class FieldIsAForeignKeyColumnName(Exception): ...
 
 def lookup_needs_distinct(opts: Options, lookup_path: str) -> bool: ...
-def prepare_lookup_value(key: str, value: Union[datetime, str]) -> Union[bool, datetime, str]: ...
+def prepare_lookup_value(key: str, value: Union[datetime.datetime, str]) -> Union[bool, datetime.datetime, str]: ...
 def quote(s: Union[int, str, UUID]) -> str: ...
 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: Sequence[Optional[Model]], request: WSGIRequest, admin_site: AdminSite
-) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
+    objs: Union[Sequence[Optional[Model]], QuerySet[Model]], request: HttpRequest, admin_site: AdminSite
+) -> Tuple[List[Model], Dict[str, int], Set[str], List[str]]: ...
 
 class NestedObjects(Collector):
-    data: collections.OrderedDict
+    data: Dict[str, Any]
     dependencies: Dict[Any, Any]
     fast_deletes: List[Any]
     field_updates: Dict[Any, Any]
@@ -39,21 +39,37 @@ 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 related_objects(self, related: ManyToOneRel, objs: Sequence[Optional[Model]]) -> QuerySet: ...
+    def related_objects(
+        self, related_model: Type[Model], related_fields: Iterable[Field], objs: _IndexableCollection[Model]
+    ) -> QuerySet[Model]: ...
     def nested(self, format_callback: Callable = ...) -> List[Any]: ...
+    def can_fast_delete(self, *args: Any, **kwargs: Any) -> bool: ...
 
-def model_format_dict(obj: Any): ...
+class _ModelFormatDict(TypedDict):
+    verbose_name: str
+    verbose_name_plural: str
+
+def model_format_dict(obj: Union[Model, Type[Model], QuerySet, Options[Model]]) -> _ModelFormatDict: ...
 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], Any, Any]: ...
+    name: Union[Callable, str], obj: Model, model_admin: Optional[BaseModelAdmin] = ...
+) -> Tuple[Optional[Field], Optional[str], Any]: ...
+@overload
+def label_for_field(  # type: ignore
+    name: Union[Callable, str],
+    model: Type[Model],
+    model_admin: Optional[BaseModelAdmin] = ...,
+    return_attr: Literal[True] = ...,
+    form: Optional[BaseForm] = ...,
+) -> Tuple[str, Union[Callable, str, None]]: ...
+@overload
 def label_for_field(
     name: Union[Callable, str],
     model: Type[Model],
     model_admin: Optional[BaseModelAdmin] = ...,
-    return_attr: bool = ...,
+    return_attr: Literal[False] = ...,
     form: Optional[BaseForm] = ...,
-) -> Union[Tuple[Optional[str], Union[Callable, Type[str]]], str]: ...
+) -> str: ...
 def help_text_for_field(name: str, model: Type[Model]) -> 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: ...
@@ -64,5 +80,5 @@ def get_model_from_relation(field: Union[Field, reverse_related.ForeignObjectRel
 def reverse_field_path(model: Type[Model], path: str) -> Tuple[Type[Model], str]: ...
 def get_fields_from_path(model: Type[Model], path: str) -> List[Field]: ...
 def construct_change_message(
-    form: AdminPasswordChangeForm, formsets: None, add: bool
+    form: AdminPasswordChangeForm, formsets: Iterable[BaseFormSet], add: bool
 ) -> List[Dict[str, Dict[str, List[str]]]]: ...

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

@@ -1,10 +1,11 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
+from django.db.models import Model
+from django.http.request import HttpRequest
 from django.views.generic.list import BaseListView
 
 class AutocompleteJsonView(BaseListView):
     model_admin: ModelAdmin = ...
     term: Any = ...
-    def has_perm(self, request: WSGIRequest, obj: None = ...) -> bool: ...
+    def has_perm(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...

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

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

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

@@ -1,19 +1,16 @@
-from collections import OrderedDict
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Type, Union
 
-from django.contrib.admin.filters import ListFilter, SimpleListFilter
-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.contrib.admin.filters import ListFilter
+from django.contrib.admin.options import IS_POPUP_VAR as IS_POPUP_VAR  # noqa: F401
+from django.contrib.admin.options import TO_FIELD_VAR as TO_FIELD_VAR
+from django.contrib.admin.options import ModelAdmin, _DisplayT, _ListFilterT
 from django.db.models.base import Model
-from django.db.models.expressions import Combinable, CombinedExpression, OrderBy
-from django.db.models.query import QuerySet
-
+from django.db.models.expressions import Expression
 from django.db.models.options import Options
+from django.db.models.query import QuerySet
 from django.forms.formsets import BaseFormSet
+from django.http.request import HttpRequest
+from typing_extensions import Literal
 
 ALL_VAR: str
 ORDER_VAR: str
@@ -21,69 +18,75 @@ ORDER_TYPE_VAR: str
 PAGE_VAR: str
 SEARCH_VAR: str
 ERROR_FLAG: str
-IGNORED_PARAMS: Any
+IGNORED_PARAMS: Tuple[str, ...]
 
 class ChangeList:
     model: Type[Model] = ...
     opts: Options = ...
     lookup_opts: Options = ...
     root_queryset: QuerySet = ...
-    list_display: List[str] = ...
-    list_display_links: List[str] = ...
-    list_filter: Tuple = ...
-    date_hierarchy: None = ...
-    search_fields: Tuple = ...
-    list_select_related: bool = ...
+    list_display: _DisplayT = ...
+    list_display_links: _DisplayT = ...
+    list_filter: Sequence[_ListFilterT] = ...
+    date_hierarchy: Any = ...
+    search_fields: Sequence[str] = ...
+    list_select_related: Union[bool, Sequence[str]] = ...
     list_per_page: int = ...
     list_max_show_all: int = ...
     model_admin: ModelAdmin = ...
     preserved_filters: str = ...
-    sortable_by: Tuple[str] = ...
+    sortable_by: Optional[Sequence[str]] = ...
     page_num: int = ...
     show_all: bool = ...
     is_popup: bool = ...
-    to_field: None = ...
-    params: Dict[Any, Any] = ...
-    list_editable: Tuple = ...
+    to_field: Any = ...
+    params: Dict[str, Any] = ...
+    list_editable: Sequence[str] = ...
     query: str = ...
     queryset: Any = ...
-    title: Any = ...
-    pk_attname: Any = ...
+    title: str = ...
+    pk_attname: str = ...
     formset: Optional[BaseFormSet]
     def __init__(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         model: Type[Model],
-        list_display: Union[List[Union[Callable, str]], Tuple[str]],
-        list_display_links: Optional[Union[List[Callable], List[str], Tuple[str]]],
-        list_filter: Union[List[Type[SimpleListFilter]], List[str], Tuple],
+        list_display: _DisplayT,
+        list_display_links: _DisplayT,
+        list_filter: Sequence[_ListFilterT],
         date_hierarchy: Optional[str],
-        search_fields: Union[List[str], Tuple],
-        list_select_related: Union[Tuple, bool],
+        search_fields: Sequence[str],
+        list_select_related: Union[bool, Sequence[str]],
         list_per_page: int,
         list_max_show_all: int,
-        list_editable: Union[List[str], Tuple],
+        list_editable: Sequence[str],
         model_admin: ModelAdmin,
-        sortable_by: Union[List[Callable], List[str], Tuple],
+        sortable_by: Optional[Sequence[str]],
     ) -> None: ...
-    def get_filters_params(self, params: None = ...) -> Dict[str, str]: ...
-    def get_filters(self, request: WSGIRequest) -> Tuple[List[ListFilter], bool, Dict[str, Union[bool, str]], bool]: ...
+    def get_filters_params(self, params: Optional[Dict[str, Any]] = ...) -> Dict[str, Any]: ...
+    def get_filters(
+        self, request: HttpRequest
+    ) -> Tuple[List[ListFilter], bool, Dict[str, Union[bool, str]], bool, bool]: ...
     def get_query_string(
-        self, new_params: Optional[Dict[str, None]] = ..., remove: Optional[List[str]] = ...
+        self, new_params: Optional[Dict[str, Any]] = ..., remove: Optional[Iterable[str]] = ...
     ) -> str: ...
-    result_count: Any = ...
-    show_full_result_count: Any = ...
-    show_admin_actions: Any = ...
-    full_result_count: Any = ...
+    result_count: int = ...
+    show_full_result_count: bool = ...
+    show_admin_actions: bool = ...
+    full_result_count: Optional[int] = ...
     result_list: Any = ...
-    can_show_all: Any = ...
-    multi_page: Any = ...
+    can_show_all: bool = ...
+    multi_page: bool = ...
     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) -> List[Union[OrderBy, Combinable, str]]: ...
-    def get_ordering_field_columns(self) -> OrderedDict: ...
-    def get_queryset(self, request: WSGIRequest) -> QuerySet: ...
+    def get_results(self, request: HttpRequest) -> None: ...
+    def get_ordering_field(self, field_name: Union[Callable, str]) -> Optional[Union[Expression, str]]: ...
+    def get_ordering(self, request: HttpRequest, queryset: QuerySet) -> List[Union[Expression, str]]: ...
+    def get_ordering_field_columns(self) -> Dict[int, Literal["desc", "asc"]]: ...
+    def get_queryset(self, request: HttpRequest) -> QuerySet: ...
+    filter_specs: List[ListFilter]
+    has_filters: bool
+    has_active_filters: bool
+    clear_all_filters_qs: str
     def apply_select_related(self, qs: QuerySet) -> QuerySet: ...
     def has_related_field_in_list_display(self) -> bool: ...
     def url_for_result(self, result: Model) -> str: ...

django-stubs/contrib/admin/widgets.pyi

@@ -1,29 +1,36 @@
-from typing import Any, Dict, Optional, Tuple, Union
-from uuid import UUID
-
-from django.contrib.admin.sites import AdminSite
-from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToOneRel
-from django.forms.models import ModelChoiceIterator
-from django.forms.widgets import Media
+from typing import Any, Dict, Iterable, List, Mapping, Optional, Sequence, Tuple, Union
 
 from django import forms
+from django.contrib.admin.sites import AdminSite
+from django.core.files.base import File
+from django.db.models.fields import _FieldChoices
+from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToManyRel, ManyToOneRel
+from django.forms.models import ModelChoiceIterator
+from django.forms.widgets import Media, _OptAttrs
+from django.utils.functional import _StrOrPromise
 
 class FilteredSelectMultiple(forms.SelectMultiple):
-    @property
-    def media(self) -> Media: ...
-    verbose_name: Any = ...
-    is_stacked: Any = ...
-    def __init__(self, verbose_name: str, is_stacked: bool, attrs: None = ..., choices: Tuple = ...) -> None: ...
+    verbose_name: _StrOrPromise = ...
+    is_stacked: bool = ...
+    def __init__(
+        self,
+        verbose_name: _StrOrPromise,
+        is_stacked: bool,
+        attrs: Optional[_OptAttrs] = ...,
+        choices: _FieldChoices = ...,
+    ) -> None: ...
 
 class AdminDateWidget(forms.DateInput):
-    @property
-    def media(self) -> Media: ...
+    def __init__(self, attrs: Optional[_OptAttrs] = ..., format: Optional[str] = ...) -> None: ...
 
 class AdminTimeWidget(forms.TimeInput):
-    @property
-    def media(self) -> Media: ...
+    def __init__(self, attrs: Optional[_OptAttrs] = ..., format: Optional[str] = ...) -> None: ...
+
+class AdminSplitDateTime(forms.SplitDateTimeWidget):
+    template_name: str
+    def __init__(self, attrs: Optional[_OptAttrs] = ...) -> None: ...
+    def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
 
-class AdminSplitDateTime(forms.SplitDateTimeWidget): ...
 class AdminRadioSelect(forms.RadioSelect): ...
 class AdminFileWidget(forms.ClearableFileInput): ...
 
@@ -32,18 +39,27 @@ def url_params_from_lookup_dict(lookups: Any) -> Dict[str, str]: ...
 class ForeignKeyRawIdWidget(forms.TextInput):
     rel: ManyToOneRel = ...
     admin_site: AdminSite = ...
-    db: None = ...
-    def __init__(self, rel: ForeignObjectRel, admin_site: AdminSite, attrs: None = ..., using: None = ...) -> None: ...
+    db: Optional[str] = ...
+    def __init__(
+        self, rel: ManyToOneRel, admin_site: AdminSite, attrs: Optional[_OptAttrs] = ..., using: Optional[str] = ...
+    ) -> None: ...
     def base_url_parameters(self) -> Dict[str, str]: ...
+    def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
     def url_parameters(self) -> Dict[str, str]: ...
-    def label_and_url_for_value(self, value: Union[int, str, UUID]) -> Tuple[str, str]: ...
+    def label_and_url_for_value(self, value: Any) -> Tuple[str, str]: ...
 
-class ManyToManyRawIdWidget(ForeignKeyRawIdWidget): ...
+class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
+    rel: ManyToManyRel = ...  # type: ignore
+    def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
+    def url_parameters(self) -> Dict[str, str]: ...
+    def label_and_url_for_value(self, value: Any) -> Tuple[str, str]: ...
+    def format_value(self, value: Any) -> Optional[str]: ...
+    def value_from_datadict(self, data: Mapping[str, Any], files: Mapping[str, Iterable[File]], name: str) -> Any: ...
 
 class RelatedFieldWidgetWrapper(forms.Widget):
     template_name: str = ...
     choices: ModelChoiceIterator = ...
-    widget: forms.Widget = ...
+    widget: forms.ChoiceWidget = ...
     rel: ManyToOneRel = ...
     can_add_related: bool = ...
     can_change_related: bool = ...
@@ -52,8 +68,8 @@ class RelatedFieldWidgetWrapper(forms.Widget):
     admin_site: AdminSite = ...
     def __init__(
         self,
-        widget: forms.Widget,
-        rel: ForeignObjectRel,
+        widget: forms.ChoiceWidget,
+        rel: ManyToOneRel,
         admin_site: AdminSite,
         can_add_related: Optional[bool] = ...,
         can_change_related: bool = ...,
@@ -61,42 +77,66 @@ class RelatedFieldWidgetWrapper(forms.Widget):
         can_view_related: bool = ...,
     ) -> None: ...
     @property
-    def media(self) -> Media: ...
+    def media(self) -> Media: ...  # type: ignore
+    @property
+    def is_hidden(self) -> bool: ...
     def get_related_url(self, info: Tuple[str, str], action: str, *args: Any) -> str: ...
+    def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
+    def value_from_datadict(self, data: Mapping[str, Any], files: Mapping[str, Iterable[File]], name: str) -> Any: ...
+    def value_omitted_from_data(
+        self, data: Mapping[str, Any], files: Mapping[str, Iterable[File]], name: str
+    ) -> bool: ...
+    def id_for_label(self, id_: str) -> str: ...
 
-class AdminTextareaWidget(forms.Textarea): ...
-class AdminTextInputWidget(forms.TextInput): ...
-class AdminEmailInputWidget(forms.EmailInput): ...
-class AdminURLFieldWidget(forms.URLInput): ...
+class AdminTextareaWidget(forms.Textarea):
+    def __init__(self, attrs: Optional[_OptAttrs] = ...) -> None: ...
+
+class AdminTextInputWidget(forms.TextInput):
+    def __init__(self, attrs: Optional[_OptAttrs] = ...) -> None: ...
+
+class AdminEmailInputWidget(forms.EmailInput):
+    def __init__(self, attrs: Optional[_OptAttrs] = ...) -> None: ...
+
+class AdminURLFieldWidget(forms.URLInput):
+    template_name: str
+    def __init__(self, attrs: Optional[_OptAttrs] = ..., validator_class: Any = ...) -> None: ...
+    def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
 
 class AdminIntegerFieldWidget(forms.NumberInput):
+    def __init__(self, attrs: Optional[_OptAttrs] = ...) -> None: ...
     class_name: str = ...
 
-class AdminBigIntegerFieldWidget(AdminIntegerFieldWidget): ...
+class AdminBigIntegerFieldWidget(AdminIntegerFieldWidget):
+    class_name: str = ...
 
 class AdminUUIDInputWidget(forms.TextInput):
-    def __init__(self, attrs: Optional[Dict[str, str]] = ...) -> None: ...
+    def __init__(self, attrs: Optional[_OptAttrs] = ...) -> None: ...
 
-SELECT2_TRANSLATIONS: Any
+SELECT2_TRANSLATIONS: Dict[str, str] = ...
 
 class AutocompleteMixin:
     url_name: str = ...
-    rel: Any = ...
-    admin_site: Any = ...
-    db: Any = ...
+    field: Any = ...
+    admin_site: AdminSite = ...
+    db: Optional[str] = ...
     choices: Any = ...
-    attrs: Any = ...
+    attrs: _OptAttrs = ...
     def __init__(
         self,
-        rel: ForeignObjectRel,
+        field: Any,
         admin_site: AdminSite,
-        attrs: Optional[Dict[str, str]] = ...,
-        choices: Tuple = ...,
-        using: None = ...,
+        attrs: Optional[_OptAttrs] = ...,
+        choices: Any = ...,
+        using: Optional[str] = ...,
     ) -> None: ...
     def get_url(self) -> str: ...
     @property
     def media(self) -> Media: ...
+    def build_attrs(self, base_attrs: _OptAttrs, extra_attrs: Optional[_OptAttrs] = ...) -> Dict[str, Any]: ...
+    # typo in source: `attr` instead of `attrs`
+    def optgroups(
+        self, name: str, value: Sequence[str], attr: Optional[_OptAttrs] = ...
+    ) -> List[Tuple[Optional[str], List[Dict[str, Any]], Optional[int]]]: ...
 
-class AutocompleteSelect(AutocompleteMixin, forms.Select): ...
-class AutocompleteSelectMultiple(AutocompleteMixin, forms.SelectMultiple): ...
+class AutocompleteSelect(AutocompleteMixin, forms.Select): ...  # type: ignore
+class AutocompleteSelectMultiple(AutocompleteMixin, forms.SelectMultiple): ...  # type: ignore

django-stubs/contrib/admindocs/apps.pyi

@@ -0,0 +1,7 @@
+from typing import Any
+
+from django.apps import AppConfig as AppConfig
+
+class AdminDocsConfig(AppConfig):
+    name: str = ...
+    verbose_name: Any = ...

django-stubs/contrib/admindocs/middleware.pyi

@@ -1,10 +1,14 @@
 from typing import Any, Callable, Dict, Optional, Tuple
 
-from django.core.handlers.wsgi import WSGIRequest
-from django.http.response import HttpResponse
+from django.http.request import HttpRequest
+from django.http.response import HttpResponse, HttpResponseBase
 from django.utils.deprecation import MiddlewareMixin
 
 class XViewMiddleware(MiddlewareMixin):
     def process_view(
-        self, request: WSGIRequest, view_func: Callable, view_args: Tuple, view_kwargs: Dict[Any, Any]
+        self,
+        request: HttpRequest,
+        view_func: Callable[..., HttpResponseBase],
+        view_args: Tuple,
+        view_kwargs: Dict[Any, Any],
     ) -> Optional[HttpResponse]: ...

django-stubs/contrib/admindocs/urls.pyi

@@ -1,3 +1,5 @@
-from typing import Any, List
+from typing import List
 
-urlpatterns: List[Any] = ...
+from django.urls import _AnyURL
+
+urlpatterns: List[_AnyURL] = ...

django-stubs/contrib/admindocs/utils.pyi

@@ -1,24 +1,25 @@
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Dict, List, Optional, Tuple
+
+from django.utils.safestring import SafeString
 
 docutils_is_available: bool
 
 def get_view_name(view_func: Callable) -> str: ...
-def trim_docstring(docstring: Any): ...
-def parse_docstring(docstring: Any): ...
-def parse_rst(text: Any, default_reference_context: Any, thing_being_parsed: Optional[Any] = ...): ...
+def parse_docstring(docstring: str) -> Tuple[str, str, Dict[str, str]]: ...
+def parse_rst(text: str, default_reference_context: Any, thing_being_parsed: Optional[Any] = ...) -> SafeString: ...
 
-ROLES: Any
+ROLES: Dict[str, str]
 
-def create_reference_role(rolename: Any, urlbase: Any): ...
+def create_reference_role(rolename: str, urlbase: str) -> None: ...
 def default_reference_role(
-    name: Any,
-    rawtext: Any,
-    text: Any,
+    name: str,
+    rawtext: str,
+    text: str,
     lineno: Any,
     inliner: Any,
     options: Optional[Any] = ...,
     content: Optional[Any] = ...,
-): ...
+) -> Tuple[List[Any], List[Any]]: ...
 
 named_group_matcher: Any
 unnamed_group_matcher: Any

django-stubs/contrib/admindocs/views.pyi

@@ -1,6 +1,7 @@
-from typing import Any, Optional, Union
+from typing import Any, Callable, Iterable, List, Optional, Pattern, Tuple, Union
 
 from django.db.models.fields import Field
+from django.urls import _AnyURL
 from django.views.generic import TemplateView
 
 MODEL_METHODS_EXCLUDE: Any
@@ -15,7 +16,9 @@ class ModelIndexView(BaseAdminDocsView): ...
 class ModelDetailView(BaseAdminDocsView): ...
 class TemplateDetailView(BaseAdminDocsView): ...
 
-def get_return_data_type(func_name: Any): ...
+def get_return_data_type(func_name: Any) -> str: ...
 def get_readable_field_data_type(field: Union[Field, str]) -> str: ...
-def extract_views_from_urlpatterns(urlpatterns: Any, base: str = ..., namespace: Optional[Any] = ...): ...
+def extract_views_from_urlpatterns(
+    urlpatterns: Iterable[_AnyURL], base: str = ..., namespace: Optional[str] = ...
+) -> List[Tuple[Callable, Pattern[str], Optional[str], Optional[str]]]: ...
 def simplify_regex(pattern: str) -> str: ...

django-stubs/contrib/auth/__init__.pyi

@@ -2,17 +2,14 @@ from typing import Any, List, Optional, Type, Union
 
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import AbstractUser, AnonymousUser
-from django.core.handlers.wsgi import WSGIRequest
-from django.db.models.base import Model
+from django.contrib.auth.models import AnonymousUser
 from django.db.models.options import Options
 from django.http.request import HttpRequest
+from django.test.client import Client
 
-from .signals import (
-    user_logged_in as user_logged_in,
-    user_logged_out as user_logged_out,
-    user_login_failed as user_login_failed,
-)
+from .signals import user_logged_in as user_logged_in
+from .signals import user_logged_out as user_logged_out
+from .signals import user_login_failed as user_login_failed
 
 SESSION_KEY: str
 BACKEND_SESSION_KEY: str
@@ -21,14 +18,14 @@ REDIRECT_FIELD_NAME: str
 
 def load_backend(path: str) -> ModelBackend: ...
 def get_backends() -> List[ModelBackend]: ...
-def authenticate(request: Any = ..., **credentials: Any) -> Optional[AbstractBaseUser]: ...
+def authenticate(request: Optional[HttpRequest] = ..., **credentials: Any) -> Optional[AbstractBaseUser]: ...
 def login(
-    request: HttpRequest, user: AbstractBaseUser, backend: Optional[Union[Type[ModelBackend], str]] = ...
+    request: HttpRequest, user: Optional[AbstractBaseUser], backend: Optional[Union[Type[ModelBackend], str]] = ...
 ) -> None: ...
 def logout(request: HttpRequest) -> None: ...
-def get_user_model() -> Type[Model]: ...
-def get_user(request: HttpRequest) -> Union[AbstractBaseUser, AnonymousUser]: ...
+def get_user_model() -> Type[AbstractBaseUser]: ...
+def get_user(request: Union[HttpRequest, Client]) -> Union[AbstractBaseUser, AnonymousUser]: ...
 def get_permission_codename(action: str, opts: Options) -> str: ...
-def update_session_auth_hash(request: WSGIRequest, user: AbstractUser) -> None: ...
+def update_session_auth_hash(request: HttpRequest, user: AbstractBaseUser) -> None: ...
 
 default_app_config: str

django-stubs/contrib/auth/admin.pyi

@@ -1,9 +1,8 @@
 from typing import Any
 
-from django.core.handlers.wsgi import WSGIRequest
-from django.http.response import HttpResponse
-
 from django.contrib import admin
+from django.http.request import HttpRequest
+from django.http.response import HttpResponse
 
 csrf_protect_m: Any
 sensitive_post_parameters_m: Any
@@ -15,4 +14,4 @@ class UserAdmin(admin.ModelAdmin):
     add_fieldsets: Any = ...
     add_form: Any = ...
     change_password_form: Any = ...
-    def user_change_password(self, request: WSGIRequest, id: str, form_url: str = ...) -> HttpResponse: ...
+    def user_change_password(self, request: HttpRequest, id: str, form_url: str = ...) -> HttpResponse: ...

django-stubs/contrib/auth/backends.pyi

@@ -1,18 +1,17 @@
-from typing import Any, Optional, Set, Union
+from typing import Any, Optional, Set, TypeVar, Union
 
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import AnonymousUser, User, Permission
-
+from django.contrib.auth.models import AnonymousUser, Permission
+from django.db.models import QuerySet
 from django.db.models.base import Model
+from django.http.request import HttpRequest
 
-_AnyUser = Union[Model, AnonymousUser]
+_AnyUser = Union[AbstractBaseUser, AnonymousUser]
 
 UserModel: Any
 
 class BaseBackend:
-    def authenticate(
-        self, request: Any, username: Optional[str] = ..., password: Optional[str] = ..., **kwargs: Any
-    ) -> Optional[AbstractBaseUser]: ...
+    def authenticate(self, request: Optional[HttpRequest], **kwargs: Any) -> Optional[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]: ...
@@ -20,6 +19,13 @@ class BaseBackend:
     def has_perm(self, user_obj: _AnyUser, perm: str, obj: Optional[Model] = ...) -> bool: ...
 
 class ModelBackend(BaseBackend):
+    def authenticate(
+        self,
+        request: Optional[HttpRequest],
+        username: Optional[str] = ...,
+        password: Optional[str] = ...,
+        **kwargs: Any
+    ) -> Optional[AbstractBaseUser]: ...
     def has_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
     def user_can_authenticate(self, user: Optional[_AnyUser]) -> bool: ...
     def with_perm(
@@ -28,13 +34,15 @@ class ModelBackend(BaseBackend):
         is_active: bool = ...,
         include_superusers: bool = ...,
         obj: Optional[Model] = ...,
-    ): ...
+    ) -> QuerySet[AbstractBaseUser]: ...
 
 class AllowAllUsersModelBackend(ModelBackend): ...
 
+_U = TypeVar("_U", bound=AbstractBaseUser)
+
 class RemoteUserBackend(ModelBackend):
     create_unknown_user: bool = ...
     def clean_username(self, username: str) -> str: ...
-    def configure_user(self, user: User) -> User: ...
+    def configure_user(self, request: HttpRequest, user: _U) -> _U: ...
 
 class AllowAllUsersRemoteUserBackend(RemoteUserBackend): ...

django-stubs/contrib/auth/base_user.pyi

@@ -1,8 +1,10 @@
-from typing import Any, Optional, Tuple, List, overload, TypeVar
-
-from django.db.models.base import Model
+from typing import Any, List, Optional, Tuple, TypeVar, Union, overload
 
 from django.db import models
+from django.db.models.base import Model
+from django.db.models.expressions import Combinable
+from django.db.models.fields import BooleanField
+from typing_extensions import Literal
 
 _T = TypeVar("_T", bound=Model)
 
@@ -17,12 +19,13 @@ class AbstractBaseUser(models.Model):
 
     password = models.CharField(max_length=128)
     last_login = models.DateTimeField(blank=True, null=True)
+    is_active: Union[bool, BooleanField[Union[bool, Combinable], bool]] = ...
     def get_username(self) -> str: ...
     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,8 +1,9 @@
-from typing import Any, List, Iterable, Optional
-
-from django.core.checks.messages import CheckMessage
+from typing import Any, Optional, Sequence
 
 from django.apps.config import AppConfig
+from django.core.checks.messages import CheckMessage
 
-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]: ...
+def check_user_model(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> Sequence[CheckMessage]: ...
+def check_models_permissions(
+    app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any
+) -> Sequence[CheckMessage]: ...

django-stubs/contrib/auth/decorators.pyi

@@ -1,13 +1,22 @@
-from typing import Callable, List, Optional, Set, Union
+from typing import Callable, Iterable, Optional, TypeVar, Union, overload
 
 from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME  # noqa: F401
+from django.contrib.auth.models import AbstractBaseUser, AnonymousUser
+from django.http.response import HttpResponseBase
+
+_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[[Union[AbstractBaseUser, AnonymousUser]], 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: ...
+    perm: Union[Iterable[str], str], login_url: Optional[str] = ..., raise_exception: bool = ...
+) -> Callable[[_VIEW], _VIEW]: ...

django-stubs/contrib/auth/forms.pyi

@@ -1,49 +1,58 @@
-from typing import Any, Dict, Iterator, Optional
-
-from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import AbstractUser, User
-from django.contrib.auth.tokens import PasswordResetTokenGenerator
-from django.core.exceptions import ValidationError
-from django.core.handlers.wsgi import WSGIRequest
+from typing import Any, Dict, Iterable, List, Optional, Type, TypeVar, Union
 
 from django import forms
+from django.contrib.auth.base_user import AbstractBaseUser
+from django.contrib.auth.tokens import PasswordResetTokenGenerator
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.db.models.fields import _ErrorMessagesT
+from django.forms.fields import _ClassLevelWidgetT
+from django.forms.widgets import Widget
+from django.http.request import HttpRequest
 
-UserModel: Any
+UserModel: Type[AbstractBaseUser]
+_User = TypeVar("_User", bound=AbstractBaseUser)
 
 class ReadOnlyPasswordHashWidget(forms.Widget):
     template_name: str = ...
+    read_only: bool = ...
+    def get_context(self, name: str, value: Any, attrs: Optional[Dict[str, Any]]) -> Dict[str, Any]: ...
 
 class ReadOnlyPasswordHashField(forms.Field):
+    widget: _ClassLevelWidgetT = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
 
-class UsernameField(forms.CharField): ...
+class UsernameField(forms.CharField):
+    def to_python(self, value: Optional[Any]) -> Optional[Any]: ...
+    def widget_attrs(self, widget: Widget) -> Dict[str, Any]: ...
 
-class UserCreationForm(forms.ModelForm):
-    error_messages: Any = ...
-    password1: Any = ...
-    password2: Any = ...
+class UserCreationForm(forms.ModelForm[_User]):
+    error_messages: _ErrorMessagesT = ...
+    password1: forms.Field = ...
+    password2: forms.Field = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def clean_password2(self) -> str: ...
+    def save(self, commit: bool = ...) -> _User: ...
 
-class UserChangeForm(forms.ModelForm):
-    password: Any = ...
+class UserChangeForm(forms.ModelForm[_User]):
+    password: forms.Field = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    def clean_password(self) -> str: ...
 
 class AuthenticationForm(forms.Form):
-    username: Any = ...
-    password: Any = ...
-    error_messages: Any = ...
-    request: WSGIRequest = ...
-    user_cache: None = ...
-    username_field: Any = ...
-    def __init__(self, request: Any = ..., *args: Any, **kwargs: Any) -> None: ...
+    username: forms.Field = ...
+    password: forms.Field = ...
+    error_messages: _ErrorMessagesT = ...
+    request: Optional[HttpRequest] = ...
+    user_cache: Any = ...
+    username_field: models.Field = ...
+    def __init__(self, request: Optional[HttpRequest] = ..., *args: Any, **kwargs: Any) -> None: ...
     def confirm_login_allowed(self, user: AbstractBaseUser) -> None: ...
-    def get_user(self) -> User: ...
+    def get_user(self) -> AbstractBaseUser: ...
     def get_invalid_login_error(self) -> ValidationError: ...
+    def clean(self) -> Dict[str, Any]: ...
 
 class PasswordResetForm(forms.Form):
-    email: Any = ...
+    email: forms.Field = ...
     def send_mail(
         self,
         subject_template_name: str,
@@ -53,7 +62,7 @@ class PasswordResetForm(forms.Form):
         to_email: str,
         html_email_template_name: Optional[str] = ...,
     ) -> None: ...
-    def get_users(self, email: str) -> Iterator[Any]: ...
+    def get_users(self, email: str) -> Iterable[AbstractBaseUser]: ...
     def save(
         self,
         domain_override: Optional[str] = ...,
@@ -62,30 +71,33 @@ class PasswordResetForm(forms.Form):
         use_https: bool = ...,
         token_generator: PasswordResetTokenGenerator = ...,
         from_email: Optional[str] = ...,
-        request: Optional[WSGIRequest] = ...,
+        request: Optional[HttpRequest] = ...,
         html_email_template_name: Optional[str] = ...,
         extra_email_context: Optional[Dict[str, str]] = ...,
     ) -> None: ...
 
 class SetPasswordForm(forms.Form):
-    error_messages: Any = ...
-    new_password1: Any = ...
-    new_password2: Any = ...
-    user: User = ...
-    def __init__(self, user: Optional[AbstractBaseUser], *args: Any, **kwargs: Any) -> None: ...
+    error_messages: _ErrorMessagesT = ...
+    new_password1: forms.Field = ...
+    new_password2: forms.Field = ...
+    user: AbstractBaseUser = ...
+    def __init__(self, user: AbstractBaseUser, *args: Any, **kwargs: Any) -> None: ...
     def clean_new_password2(self) -> str: ...
     def save(self, commit: bool = ...) -> AbstractBaseUser: ...
 
 class PasswordChangeForm(SetPasswordForm):
-    old_password: Any = ...
+    error_messages: _ErrorMessagesT = ...
+    old_password: forms.Field = ...
     def clean_old_password(self) -> str: ...
 
 class AdminPasswordChangeForm(forms.Form):
-    error_messages: Any = ...
+    error_messages: _ErrorMessagesT = ...
     required_css_class: str = ...
-    password1: Any = ...
-    password2: Any = ...
-    user: User = ...
-    def __init__(self, user: AbstractUser, *args: Any, **kwargs: Any) -> None: ...
+    password1: forms.Field = ...
+    password2: forms.Field = ...
+    user: AbstractBaseUser = ...
+    def __init__(self, user: AbstractBaseUser, *args: Any, **kwargs: Any) -> None: ...
     def clean_password2(self) -> str: ...
-    def save(self, commit: bool = ...) -> AbstractUser: ...
+    def save(self, commit: bool = ...) -> AbstractBaseUser: ...
+    @property
+    def changed_data(self) -> List[str]: ...

django-stubs/contrib/auth/hashers.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 UNUSABLE_PASSWORD_PREFIX: str
 UNUSABLE_PASSWORD_SUFFIX_LENGTH: int
@@ -7,17 +7,19 @@ def is_password_usable(encoded: Optional[str]) -> bool: ...
 def check_password(
     password: Optional[str], encoded: str, setter: Optional[Callable] = ..., preferred: str = ...
 ) -> bool: ...
-def make_password(password: Optional[str], salt: Optional[str] = ..., hasher: str = ...) -> str: ...
+def make_password(
+    password: Optional[str], salt: Optional[str] = ..., hasher: Union[str, BasePasswordHasher] = ...
+) -> str: ...
 def get_hashers() -> List[BasePasswordHasher]: ...
 def get_hashers_by_algorithm() -> Dict[str, BasePasswordHasher]: ...
 def reset_hashers(**kwargs: Any) -> None: ...
-def get_hasher(algorithm: str = ...) -> BasePasswordHasher: ...
+def get_hasher(algorithm: Union[str, BasePasswordHasher] = ...) -> BasePasswordHasher: ...
 def identify_hasher(encoded: str) -> BasePasswordHasher: ...
 def mask_hash(hash: str, show: int = ..., char: str = ...) -> str: ...
 
 class BasePasswordHasher:
     algorithm: str = ...
-    library: str = ...
+    library: Union[str, Tuple[str, str]] = ...
     rounds: int = ...
     time_cost: int = ...
     memory_cost: int = ...

django-stubs/contrib/auth/management/__init__.pyi

@@ -12,4 +12,4 @@ def create_permissions(
     **kwargs: Any
 ) -> None: ...
 def get_system_username() -> str: ...
-def get_default_username(check_db: bool = ...) -> str: ...
+def get_default_username(check_db: bool = ..., database: str = ...) -> str: ...

django-stubs/contrib/auth/middleware.pyi

@@ -1,11 +1,11 @@
 from typing import Union
 
-from django.contrib.auth.models import AnonymousUser, User
-from django.core.handlers.wsgi import WSGIRequest
+from django.contrib.auth.base_user import AbstractBaseUser
+from django.contrib.auth.models import AnonymousUser
 from django.http.request import HttpRequest
 from django.utils.deprecation import MiddlewareMixin
 
-def get_user(request: WSGIRequest) -> Union[AnonymousUser, User]: ...
+def get_user(request: HttpRequest) -> Union[AnonymousUser, AbstractBaseUser]: ...
 
 class AuthenticationMiddleware(MiddlewareMixin):
     def process_request(self, request: HttpRequest) -> None: ...

django-stubs/contrib/auth/mixins.pyi

@@ -1,7 +1,7 @@
-from typing import Any, Callable, List, Optional
+from typing import Any, Callable, Optional, Sequence
 
 from django import http
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponseBase, HttpResponseRedirect
 
 class AccessMixin:
     login_url: Any = ...
@@ -14,15 +14,15 @@ class AccessMixin:
     def handle_no_permission(self) -> HttpResponseRedirect: ...
 
 class LoginRequiredMixin(AccessMixin):
-    def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
+    def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponseBase: ...
 
 class PermissionRequiredMixin(AccessMixin):
     permission_required: Any = ...
-    def get_permission_required(self) -> List[str]: ...
+    def get_permission_required(self) -> Sequence[str]: ...
     def has_permission(self) -> bool: ...
-    def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
+    def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponseBase: ...
 
 class UserPassesTestMixin(AccessMixin):
     def test_func(self) -> Optional[bool]: ...
     def get_test_func(self) -> Callable: ...
-    def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
+    def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponseBase: ...

django-stubs/contrib/auth/models.pyi

@@ -1,13 +1,14 @@
-from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar, Union
+from typing import Any, Iterable, 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.base_user import AbstractBaseUser as AbstractBaseUser
+from django.contrib.auth.base_user import BaseUserManager as BaseUserManager
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.contenttypes.models import ContentType
+from django.db import models
+from django.db.models import QuerySet
 from django.db.models.base import Model
 from django.db.models.manager import EmptyManager
-
-from django.db import models
+from typing_extensions import Literal
 
 _AnyUser = Union[Model, "AnonymousUser"]
 
@@ -33,7 +34,7 @@ class Group(models.Model):
 
     name = models.CharField(max_length=150)
     permissions = models.ManyToManyField(Permission)
-    def natural_key(self): ...
+    def natural_key(self) -> Tuple[str]: ...
 
 _T = TypeVar("_T", bound=Model)
 
@@ -42,16 +43,16 @@ class UserManager(BaseUserManager[_T]):
         self, username: str, email: Optional[str] = ..., password: Optional[str] = ..., **extra_fields: Any
     ) -> _T: ...
     def create_superuser(
-        self, username: str, email: Optional[str], password: Optional[str], **extra_fields: Any
+        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]] = ...,
+        backend: Optional[str] = ...,
         obj: Optional[Model] = ...,
-    ): ...
+    ) -> QuerySet[_T]: ...
 
 class PermissionsMixin(models.Model):
     is_superuser = models.BooleanField()
@@ -61,10 +62,10 @@ class PermissionsMixin(models.Model):
     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_perms(self, perm_list: Iterable[str], obj: Optional[_AnyUser] = ...) -> bool: ...
     def has_module_perms(self, app_label: str) -> bool: ...
 
-class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
+class AbstractUser(AbstractBaseUser, PermissionsMixin):
     username_validator: UnicodeUsernameValidator = ...
 
     username = models.CharField(max_length=150)
@@ -86,26 +87,26 @@ class User(AbstractUser): ...
 class AnonymousUser:
     id: Any = ...
     pk: Any = ...
-    username: str = ...
-    is_staff: bool = ...
-    is_active: bool = ...
-    is_superuser: bool = ...
-    def save(self) -> Any: ...
-    def delete(self) -> Any: ...
-    def set_password(self, raw_password: str) -> Any: ...
+    username: Literal[""] = ...
+    is_staff: Literal[False] = ...
+    is_active: Literal[False] = ...
+    is_superuser: Literal[False] = ...
+    def save(self) -> None: ...
+    def delete(self) -> None: ...
+    def set_password(self, raw_password: str) -> None: ...
     def check_password(self, raw_password: str) -> Any: ...
     @property
-    def groups(self) -> EmptyManager: ...
+    def groups(self) -> EmptyManager[Group]: ...
     @property
-    def user_permissions(self) -> EmptyManager: ...
+    def user_permissions(self) -> EmptyManager[Permission]: ...
     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_perms(self, perm_list: Iterable[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

@@ -6,7 +6,8 @@ from django.db.models.base import Model
 _UserModel = Model
 
 class PasswordValidator(Protocol):
-    def password_changed(self, password: str, user: Optional[_UserModel] = ...): ...
+    def validate(self, __password: str, __user: Optional[_UserModel] = ...) -> None: ...
+    def get_help_text(self) -> str: ...
 
 def get_default_password_validators() -> List[PasswordValidator]: ...
 def get_password_validators(validator_config: Sequence[Mapping[str, Any]]) -> List[PasswordValidator]: ...
@@ -37,7 +38,7 @@ class UserAttributeSimilarityValidator:
 class CommonPasswordValidator:
     DEFAULT_PASSWORD_LIST_PATH: Path = ...
     passwords: Set[str] = ...
-    def __init__(self, password_list_path: Union[PosixPath, str] = ...) -> None: ...
+    def __init__(self, password_list_path: Union[Path, PosixPath, str] = ...) -> None: ...
     def validate(self, password: str, user: Optional[_UserModel] = ...) -> None: ...
     def get_help_text(self) -> str: ...
 

django-stubs/contrib/auth/tokens.pyi

@@ -1,11 +1,17 @@
-from typing import Any, Optional
+from datetime import date, datetime
+from typing import Any, Optional, Union
 
 from django.contrib.auth.base_user import AbstractBaseUser
 
 class PasswordResetTokenGenerator:
     key_salt: str = ...
     secret: Any = ...
+    algorithm: str = ...
     def make_token(self, user: AbstractBaseUser) -> str: ...
     def check_token(self, user: Optional[AbstractBaseUser], token: Optional[str]) -> bool: ...
+    def _make_token_with_timestamp(self, user: AbstractBaseUser, timestamp: int, legacy: bool = ...) -> str: ...
+    def _make_hash_value(self, user: AbstractBaseUser, timestamp: int) -> str: ...
+    def _num_seconds(self, dt: Union[datetime, date]) -> int: ...
+    def _now(self) -> datetime: ...
 
 default_token_generator: Any

django-stubs/contrib/auth/urls.pyi

@@ -1,3 +1,5 @@
-from typing import Any, List
+from typing import List
 
-urlpatterns: List[Any] = ...
+from django.urls import _AnyURL
+
+urlpatterns: List[_AnyURL] = ...

django-stubs/contrib/auth/validators.pyi

@@ -1,4 +1,4 @@
-from django.core import validators
+from django.core.validators import RegexValidator
 
-class ASCIIUsernameValidator(validators.RegexValidator): ...
-class UnicodeUsernameValidator(validators.RegexValidator): ...
+class ASCIIUsernameValidator(RegexValidator): ...
+class UnicodeUsernameValidator(RegexValidator): ...

django-stubs/contrib/auth/views.pyi

@@ -1,10 +1,9 @@
-from typing import Any, Optional, Set
+from typing import Any, Dict, Optional, Set
 
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.core.handlers.wsgi import WSGIRequest
+from django.contrib.auth.forms import AuthenticationForm
 from django.http.request import HttpRequest
-from django.http.response import HttpResponseRedirect
-from django.template.response import TemplateResponse
+from django.http.response import HttpResponse, HttpResponseRedirect
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormView
 
@@ -14,7 +13,7 @@ class SuccessURLAllowedHostsMixin:
     success_url_allowed_hosts: Any = ...
     def get_success_url_allowed_hosts(self) -> Set[str]: ...
 
-class LoginView(SuccessURLAllowedHostsMixin, FormView):
+class LoginView(SuccessURLAllowedHostsMixin, FormView[AuthenticationForm]):
     authentication_form: Any = ...
     redirect_field_name: Any = ...
     redirect_authenticated_user: bool = ...
@@ -22,10 +21,11 @@ class LoginView(SuccessURLAllowedHostsMixin, FormView):
     def get_redirect_url(self) -> str: ...
 
 class LogoutView(SuccessURLAllowedHostsMixin, TemplateView):
-    next_page: Any = ...
-    redirect_field_name: Any = ...
+    next_page: Optional[str] = ...
+    redirect_field_name: str = ...
     extra_context: Any = ...
-    def post(self, request: WSGIRequest, *args: Any, **kwargs: Any) -> TemplateResponse: ...
+    def dispatch(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
     def get_next_page(self) -> Optional[str]: ...
 
 def logout_then_login(request: HttpRequest, login_url: Optional[str] = ...) -> HttpResponseRedirect: ...
@@ -35,7 +35,7 @@ def redirect_to_login(
 
 class PasswordContextMixin:
     extra_context: Any = ...
-    def get_context_data(self, **kwargs: Any): ...
+    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: ...
 
 class PasswordResetView(PasswordContextMixin, FormView):
     email_template_name: str = ...

django-stubs/contrib/contenttypes/admin.pyi

@@ -1,9 +1,10 @@
 from typing import Any, List, Type
 
+from django.contrib.admin.checks import InlineModelAdminChecks
 from django.contrib.admin.options import InlineModelAdmin
 from django.db.models.base import Model
 
-class GenericInlineModelAdminChecks:
+class GenericInlineModelAdminChecks(InlineModelAdminChecks):
     def _check_exclude_of_parent_model(self, obj: GenericInlineModelAdmin, parent_model: Type[Model]) -> List[Any]: ...
     def _check_relation(self, obj: GenericInlineModelAdmin, parent_model: Type[Model]) -> List[Any]: ...
 

django-stubs/contrib/contenttypes/checks.pyi

@@ -1,6 +1,11 @@
-from typing import Any, List, Iterable, Optional
+from typing import Any, Optional, Sequence
 
 from django.apps.config import AppConfig
+from django.core.checks.messages import CheckMessage
 
-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]: ...
+def check_generic_foreign_keys(
+    app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any
+) -> Sequence[CheckMessage]: ...
+def check_model_name_lengths(
+    app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any
+) -> Sequence[CheckMessage]: ...

django-stubs/contrib/contenttypes/fields.pyi

@@ -1,9 +1,10 @@
 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.core.checks.messages import CheckMessage
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable
+from django.db.models.fields import Field
 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
@@ -12,8 +13,6 @@ 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]
@@ -41,7 +40,7 @@ class GenericForeignKey(FieldCacheMixin):
     def contribute_to_class(self, cls: Type[Model], name: str, **kwargs: Any) -> None: ...
     def get_filter_kwargs_for_object(self, obj: Model) -> Dict[str, Optional[ContentType]]: ...
     def get_forward_related_filter(self, obj: Model) -> Dict[str, int]: ...
-    def check(self, **kwargs: Any) -> List[Error]: ...
+    def check(self, **kwargs: Any) -> List[CheckMessage]: ...
     def get_cache_name(self) -> str: ...
     def get_content_type(
         self, obj: Optional[Model] = ..., id: Optional[int] = ..., using: Optional[str] = ...
@@ -49,7 +48,7 @@ class GenericForeignKey(FieldCacheMixin):
     def get_prefetch_queryset(
         self, instances: Union[List[Model], QuerySet], queryset: Optional[QuerySet] = ...
     ) -> Tuple[List[Model], Callable, Callable, bool, str, bool]: ...
-    def __get__(self, instance: Optional[Model], cls: Type[Model] = ...) -> Optional[Any]: ...
+    def __get__(self, instance: Optional[Model], cls: Optional[Type[Model]] = ...) -> Optional[Any]: ...
     def __set__(self, instance: Model, value: Optional[Any]) -> None: ...
 
 class GenericRel(ForeignObjectRel):
@@ -66,9 +65,9 @@ class GenericRel(ForeignObjectRel):
 class GenericRelation(ForeignObject):
     rel_class: Any = ...
     mti_inherited: bool = ...
-    object_id_field_name: Any = ...
-    content_type_field_name: Any = ...
-    for_concrete_model: Any = ...
+    object_id_field_name: str = ...
+    content_type_field_name: str = ...
+    for_concrete_model: bool = ...
     to_fields: Any = ...
     def __init__(
         self,
@@ -80,10 +79,9 @@ class GenericRelation(ForeignObject):
         limit_choices_to: Optional[Union[Dict[str, Any], Callable[[], Any]]] = ...,
         **kwargs: Any
     ) -> None: ...
-    def resolve_related_fields(self) -> List[Tuple[PositiveIntegerField, Field]]: ...
+    def resolve_related_fields(self) -> List[Tuple[Field, Field]]: ...
     def get_path_info(self, filtered_relation: Optional[FilteredRelation] = ...) -> List[PathInfo]: ...
-    def get_reverse_path_info(self, filtered_relation: None = ...) -> List[PathInfo]: ...
-    def value_to_string(self, obj: Model) -> str: ...
+    def get_reverse_path_info(self, filtered_relation: Optional[FilteredRelation] = ...) -> List[PathInfo]: ...
     def get_content_type(self) -> ContentType: ...
     def get_extra_restriction(
         self, where_class: Type[WhereNode], alias: Optional[str], remote_alias: str
@@ -92,4 +90,4 @@ class GenericRelation(ForeignObject):
 
 class ReverseGenericManyToOneDescriptor(ReverseManyToOneDescriptor): ...
 
-def create_generic_related_manager(superclass: Any, rel: Any): ...
+def create_generic_related_manager(superclass: Any, rel: Any) -> Type[Any]: ...  # GenericRelatedObjectManager

django-stubs/contrib/contenttypes/forms.pyi

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

django-stubs/contrib/contenttypes/management/__init__.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, Type
+from typing import Any, Dict, List, Tuple, Type
 
 from django.apps.config import AppConfig
 from django.apps.registry import Apps

django-stubs/contrib/contenttypes/management/commands/remove_stale_contenttypes.pyi

@@ -1,8 +1,7 @@
 from typing import Any, Dict, List
 
-from django.db.models.deletion import Collector
-
 from django.core.management import BaseCommand
+from django.db.models.deletion import Collector
 
 class Command(BaseCommand): ...
 

django-stubs/contrib/flatpages/admin.pyi

@@ -0,0 +1,10 @@
+from typing import Any
+
+from django.contrib import admin
+
+class FlatPageAdmin(admin.ModelAdmin):
+    form: Any = ...
+    fieldsets: Any = ...
+    list_display: Any = ...
+    list_filter: Any = ...
+    search_fields: Any = ...

django-stubs/contrib/flatpages/apps.pyi

@@ -0,0 +1,7 @@
+from typing import Any
+
+from django.apps import AppConfig as AppConfig
+
+class FlatPagesConfig(AppConfig):
+    name: str = ...
+    verbose_name: Any = ...

django-stubs/contrib/flatpages/middleware.pyi

@@ -1,6 +1,6 @@
-from django.core.handlers.wsgi import WSGIRequest
+from django.http.request import HttpRequest
 from django.http.response import HttpResponse
 from django.utils.deprecation import MiddlewareMixin
 
 class FlatpageFallbackMiddleware(MiddlewareMixin):
-    def process_response(self, request: WSGIRequest, response: HttpResponse) -> HttpResponse: ...
+    def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...

django-stubs/contrib/flatpages/models.pyi

@@ -1,5 +1,4 @@
 from django.contrib.sites.models import Site
-
 from django.db import models
 
 class FlatPage(models.Model):

django-stubs/contrib/flatpages/urls.pyi

@@ -1,3 +1,5 @@
-from typing import Any, List
+from typing import List
 
-urlpatterns: List[Any] = ...
+from django.urls import _AnyURL
+
+urlpatterns: List[_AnyURL] = ...

django-stubs/contrib/flatpages/views.pyi

@@ -1,8 +1,8 @@
 from django.contrib.flatpages.models import FlatPage
-from django.core.handlers.wsgi import WSGIRequest
+from django.http.request import HttpRequest
 from django.http.response import HttpResponse
 
 DEFAULT_TEMPLATE: str
 
-def flatpage(request: WSGIRequest, url: str) -> HttpResponse: ...
-def render_flatpage(request: WSGIRequest, f: FlatPage) -> HttpResponse: ...
+def flatpage(request: HttpRequest, url: str) -> HttpResponse: ...
+def render_flatpage(request: HttpRequest, f: FlatPage) -> HttpResponse: ...

django-stubs/contrib/gis/__init__.pyi

@@ -0,0 +1 @@
+default_app_config: str

django-stubs/contrib/gis/admin/__init__.pyi

@@ -0,0 +1,11 @@
+from django.contrib.admin import HORIZONTAL as HORIZONTAL
+from django.contrib.admin import VERTICAL as VERTICAL
+from django.contrib.admin import AdminSite as AdminSite
+from django.contrib.admin import ModelAdmin as ModelAdmin
+from django.contrib.admin import StackedInline as StackedInline
+from django.contrib.admin import TabularInline as TabularInline
+from django.contrib.admin import autodiscover as autodiscover
+from django.contrib.admin import register as register
+from django.contrib.admin import site as site
+from django.contrib.gis.admin.options import GeoModelAdmin as GeoModelAdmin
+from django.contrib.gis.admin.options import OSMGeoAdmin as OSMGeoAdmin

django-stubs/contrib/gis/admin/options.pyi

@@ -0,0 +1,48 @@
+from typing import Any, Union
+
+from django.contrib.admin import ModelAdmin as ModelAdmin
+
+spherical_mercator_srid: int
+
+class GeoModelAdmin(ModelAdmin):
+    default_lon: int = ...
+    default_lat: int = ...
+    default_zoom: int = ...
+    display_wkt: bool = ...
+    display_srid: bool = ...
+    extra_js: Any = ...
+    num_zoom: int = ...
+    max_zoom: bool = ...
+    min_zoom: bool = ...
+    units: Union[str, bool] = ...
+    max_resolution: Union[str, bool] = ...
+    max_extent: Union[str, bool] = ...
+    modifiable: bool = ...
+    mouse_position: bool = ...
+    scale_text: bool = ...
+    layerswitcher: bool = ...
+    scrollable: bool = ...
+    map_width: int = ...
+    map_height: int = ...
+    map_srid: int = ...
+    map_template: str = ...
+    openlayers_url: str = ...
+    point_zoom: Any = ...
+    wms_url: str = ...
+    wms_layer: str = ...
+    wms_name: str = ...
+    wms_options: Any = ...
+    debug: bool = ...
+    widget: Any = ...
+    @property
+    def media(self) -> Any: ...
+    def get_map_widget(self, db_field: Any) -> Any: ...
+
+class OSMGeoAdmin(GeoModelAdmin):
+    map_template: str = ...
+    num_zoom: int = ...
+    map_srid: Any = ...
+    max_extent: str = ...
+    max_resolution: str = ...
+    point_zoom: int = ...
+    units: str = ...

django-stubs/contrib/gis/admin/widgets.pyi

@@ -0,0 +1,11 @@
+from logging import Logger
+from typing import Any
+
+from django.forms.widgets import Textarea as Textarea
+
+geo_context: Any
+logger: Logger
+
+class OpenLayersWidget(Textarea):
+    def get_context(self, name: Any, value: Any, attrs: Any) -> Any: ...
+    def map_options(self) -> Any: ...

django-stubs/contrib/gis/apps.pyi

@@ -0,0 +1,8 @@
+from typing import Any
+
+from django.apps import AppConfig as AppConfig
+
+class GISConfig(AppConfig):
+    name: str = ...
+    verbose_name: Any = ...
+    def ready(self) -> None: ...

django-stubs/contrib/gis/db/backends/base/adapter.pyi

@@ -0,0 +1,8 @@
+from typing import Any
+
+class WKTAdapter:
+    wkt: Any = ...
+    srid: Any = ...
+    def __init__(self, geom: Any) -> None: ...
+    def __eq__(self, other: Any) -> Any: ...
+    def __hash__(self) -> Any: ...

django-stubs/contrib/gis/db/backends/base/features.pyi

@@ -0,0 +1,44 @@
+from typing import Any
+
+class BaseSpatialFeatures:
+    gis_enabled: bool = ...
+    has_spatialrefsys_table: bool = ...
+    supports_add_srs_entry: bool = ...
+    supports_geometry_field_introspection: bool = ...
+    supports_3d_storage: bool = ...
+    supports_3d_functions: bool = ...
+    supports_transform: bool = ...
+    supports_null_geometries: bool = ...
+    supports_empty_geometries: bool = ...
+    supports_distance_geodetic: bool = ...
+    supports_length_geodetic: bool = ...
+    supports_perimeter_geodetic: bool = ...
+    supports_area_geodetic: bool = ...
+    supports_num_points_poly: bool = ...
+    supports_left_right_lookups: bool = ...
+    supports_dwithin_distance_expr: bool = ...
+    supports_raster: bool = ...
+    supports_geometry_field_unique_index: bool = ...
+    @property
+    def supports_bbcontains_lookup(self) -> bool: ...
+    @property
+    def supports_contained_lookup(self) -> bool: ...
+    @property
+    def supports_crosses_lookup(self) -> bool: ...
+    @property
+    def supports_distances_lookups(self) -> bool: ...
+    @property
+    def supports_dwithin_lookup(self) -> bool: ...
+    @property
+    def supports_relate_lookup(self) -> bool: ...
+    @property
+    def supports_isvalid_lookup(self) -> bool: ...
+    @property
+    def supports_collect_aggr(self) -> bool: ...
+    @property
+    def supports_extent_aggr(self) -> bool: ...
+    @property
+    def supports_make_line_aggr(self) -> bool: ...
+    @property
+    def supports_union_aggr(self) -> bool: ...
+    def __getattr__(self, name: Any) -> bool: ...

django-stubs/contrib/gis/db/backends/base/models.pyi

@@ -0,0 +1,33 @@
+from typing import Any
+
+class SpatialRefSysMixin:
+    @property
+    def srs(self) -> Any: ...
+    @property
+    def ellipsoid(self) -> Any: ...
+    @property
+    def name(self) -> Any: ...
+    @property
+    def spheroid(self) -> Any: ...
+    @property
+    def datum(self) -> Any: ...
+    @property
+    def projected(self) -> Any: ...
+    @property
+    def local(self) -> Any: ...
+    @property
+    def geographic(self) -> Any: ...
+    @property
+    def linear_name(self) -> Any: ...
+    @property
+    def linear_units(self) -> Any: ...
+    @property
+    def angular_name(self) -> Any: ...
+    @property
+    def angular_units(self) -> Any: ...
+    @property
+    def units(self) -> Any: ...
+    @classmethod
+    def get_units(cls, wkt: Any) -> Any: ...
+    @classmethod
+    def get_spheroid(cls, wkt: Any, string: bool = ...) -> Any: ...

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

@@ -0,0 +1,34 @@
+from typing import Any, Set
+
+class BaseSpatialOperations:
+    postgis: bool = ...
+    spatialite: bool = ...
+    mysql: bool = ...
+    oracle: bool = ...
+    spatial_version: Any = ...
+    select: str = ...
+    @property
+    def select_extent(self) -> str: ...
+    geography: bool = ...
+    geometry: bool = ...
+    disallowed_aggregates: Any = ...
+    geom_func_prefix: str = ...
+    function_names: Any = ...
+    unsupported_functions: Set[str] = ...
+    from_text: bool = ...
+    def convert_extent(self, box: Any, srid: Any) -> Any: ...
+    def convert_extent3d(self, box: Any, srid: Any) -> Any: ...
+    def geo_quote_name(self, name: Any) -> Any: ...
+    def geo_db_type(self, f: Any) -> Any: ...
+    def get_distance(self, f: Any, value: Any, lookup_type: Any) -> Any: ...
+    def get_geom_placeholder(self, f: Any, value: Any, compiler: Any) -> Any: ...
+    def check_expression_support(self, expression: Any) -> None: ...
+    def spatial_aggregate_name(self, agg_name: Any) -> Any: ...
+    def spatial_function_name(self, func_name: Any) -> Any: ...
+    def geometry_columns(self) -> Any: ...
+    def spatial_ref_sys(self) -> Any: ...
+    distance_expr_for_lookup: Any = ...
+    def get_db_converters(self, expression: Any) -> Any: ...
+    def get_geometry_converter(self, expression: Any) -> Any: ...
+    def get_area_att_for_field(self, field: Any) -> Any: ...
+    def get_distance_att_for_field(self, field: Any) -> Any: ...

django-stubs/contrib/gis/db/backends/mysql/base.pyi

@@ -0,0 +1,9 @@
+from typing import Any
+
+from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper
+
+class DatabaseWrapper(MySQLDatabaseWrapper):
+    SchemaEditorClass: Any = ...
+    features_class: Any = ...
+    introspection_class: Any = ...
+    ops_class: Any = ...

django-stubs/contrib/gis/db/backends/mysql/features.pyi

@@ -0,0 +1,20 @@
+from typing import Any, Dict
+
+from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures as BaseSpatialFeatures
+from django.db.backends.mysql.features import DatabaseFeatures as MySQLDatabaseFeatures
+
+class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures):
+    has_spatialrefsys_table: bool = ...
+    supports_add_srs_entry: bool = ...
+    supports_distance_geodetic: bool = ...
+    supports_length_geodetic: bool = ...
+    supports_area_geodetic: bool = ...
+    supports_transform: bool = ...
+    supports_null_geometries: bool = ...
+    supports_num_points_poly: bool = ...
+    @property
+    def empty_intersection_returns_none(self) -> bool: ...
+    @property
+    def supports_geometry_field_unique_index(self) -> bool: ...  # type: ignore
+    @property
+    def django_test_skips(self) -> Dict[str, Any]: ...  # type: ignore

django-stubs/contrib/gis/db/backends/mysql/introspection.pyi

@@ -0,0 +1,8 @@
+from typing import Any
+
+from django.db.backends.mysql.introspection import DatabaseIntrospection as DatabaseIntrospection
+
+class MySQLIntrospection(DatabaseIntrospection):
+    data_types_reverse: Any = ...
+    def get_geometry_type(self, table_name: Any, description: Any) -> Any: ...
+    def supports_spatial_index(self, cursor: Any, table_name: Any) -> Any: ...

django-stubs/contrib/gis/db/backends/mysql/operations.pyi

@@ -0,0 +1,27 @@
+from typing import Any, Callable, Dict, List, Optional, Set, Type
+
+from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations as BaseSpatialOperations
+from django.contrib.gis.db.backends.utils import SpatialOperator
+from django.contrib.gis.geos.geometry import GEOSGeometryBase
+from django.db.backends.mysql.operations import DatabaseOperations as DatabaseOperations
+
+class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
+    name: str = ...
+    geom_func_prefix: str = ...
+    Adapter: Any = ...
+    @property
+    def mariadb(self) -> bool: ...
+    @property
+    def mysql(self) -> bool: ...  # type: ignore
+    @property
+    def select(self) -> str: ...  # type: ignore
+    @property
+    def from_text(self) -> str: ...  # type: ignore
+    @property
+    def gis_operators(self) -> Dict[str, SpatialOperator]: ...
+    disallowed_aggregates: Any = ...
+    @property
+    def unsupported_functions(self) -> Set[str]: ...  # type: ignore
+    def geo_db_type(self, f: Any) -> Any: ...
+    def get_distance(self, f: Any, value: Any, lookup_type: Any) -> List[Any]: ...
+    def get_geometry_converter(self, expression: Any) -> Callable[[Any, Any, Any], Optional[GEOSGeometryBase]]: ...

django-stubs/contrib/gis/db/backends/mysql/schema.pyi

@@ -0,0 +1,18 @@
+from logging import Logger
+from typing import Any
+
+from django.db.backends.mysql.schema import DatabaseSchemaEditor as DatabaseSchemaEditor
+
+logger: Logger
+
+class MySQLGISSchemaEditor(DatabaseSchemaEditor):
+    sql_add_spatial_index: str = ...
+    sql_drop_spatial_index: str = ...
+    geometry_sql: Any = ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def skip_default(self, field: Any) -> Any: ...
+    def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
+    def create_model(self, model: Any) -> None: ...
+    def add_field(self, model: Any, field: Any) -> None: ...
+    def remove_field(self, model: Any, field: Any) -> None: ...
+    def create_spatial_indexes(self) -> None: ...

django-stubs/contrib/gis/db/backends/oracle/adapter.pyi

@@ -0,0 +1,9 @@
+from typing import Any
+
+from django.contrib.gis.db.backends.base.adapter import WKTAdapter
+
+class OracleSpatialAdapter(WKTAdapter):
+    input_size: Any = ...
+    wkt: Any = ...
+    srid: Any = ...
+    def __init__(self, geom: Any) -> None: ...

django-stubs/contrib/gis/db/backends/oracle/base.pyi

@@ -0,0 +1,9 @@
+from typing import Any
+
+from django.db.backends.oracle.base import DatabaseWrapper as OracleDatabaseWrapper
+
+class DatabaseWrapper(OracleDatabaseWrapper):
+    SchemaEditorClass: Any = ...
+    features_class: Any = ...
+    introspection_class: Any = ...
+    ops_class: Any = ...

django-stubs/contrib/gis/db/backends/oracle/features.pyi

@@ -0,0 +1,9 @@
+from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures as BaseSpatialFeatures
+from django.db.backends.oracle.features import DatabaseFeatures as OracleDatabaseFeatures
+
+class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures):
+    supports_add_srs_entry: bool = ...
+    supports_geometry_field_introspection: bool = ...
+    supports_geometry_field_unique_index: bool = ...
+    supports_perimeter_geodetic: bool = ...
+    supports_dwithin_distance_expr: bool = ...

django-stubs/contrib/gis/db/backends/oracle/introspection.pyi

@@ -0,0 +1,8 @@
+from typing import Any
+
+from django.db.backends.oracle.introspection import DatabaseIntrospection as DatabaseIntrospection
+
+class OracleIntrospection(DatabaseIntrospection):
+    @property
+    def data_types_reverse(self) -> Any: ...
+    def get_geometry_type(self, table_name: Any, description: Any) -> Any: ...

django-stubs/contrib/gis/db/backends/oracle/models.pyi

@@ -0,0 +1,33 @@
+from typing import Any
+
+from django.contrib.gis.db import models
+from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin
+
+class OracleGeometryColumns(models.Model):
+    table_name: Any = ...
+    column_name: Any = ...
+    srid: Any = ...
+
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @classmethod
+    def table_name_col(cls) -> Any: ...
+    @classmethod
+    def geom_col_name(cls) -> Any: ...
+
+class OracleSpatialRefSys(models.Model, SpatialRefSysMixin):
+    cs_name: Any = ...
+    srid: Any = ...
+    auth_srid: Any = ...
+    auth_name: Any = ...
+    wktext: Any = ...
+    cs_bounds: Any = ...
+
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @property
+    def wkt(self) -> Any: ...

django-stubs/contrib/gis/db/backends/oracle/operations.pyi

@@ -0,0 +1,42 @@
+from typing import Any
+
+from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations as BaseSpatialOperations
+from django.contrib.gis.db.backends.utils import SpatialOperator as SpatialOperator
+from django.db.backends.oracle.operations import DatabaseOperations as DatabaseOperations
+
+DEFAULT_TOLERANCE: str
+
+class SDOOperator(SpatialOperator):
+    sql_template: str = ...
+
+class SDODWithin(SpatialOperator):
+    sql_template: str = ...
+
+class SDODisjoint(SpatialOperator):
+    sql_template: Any = ...
+
+class SDORelate(SpatialOperator):
+    sql_template: str = ...
+    def check_relate_argument(self, arg: Any) -> None: ...
+
+class OracleOperations(BaseSpatialOperations, DatabaseOperations):
+    name: str = ...
+    oracle: bool = ...
+    disallowed_aggregates: Any = ...
+    Adapter: Any = ...
+    extent: str = ...
+    unionagg: str = ...
+    function_names: Any = ...
+    select: str = ...
+    gis_operators: Any = ...
+    unsupported_functions: Any = ...
+    def geo_quote_name(self, name: Any) -> Any: ...
+    def geo_db_type(self, f: Any) -> Any: ...
+    def get_distance(self, f: Any, value: Any, lookup_type: Any) -> Any: ...
+    def get_geom_placeholder(self, f: Any, value: Any, compiler: Any) -> Any: ...
+    def spatial_aggregate_name(self, agg_name: Any) -> Any: ...
+    def geometry_columns(self) -> Any: ...
+    def spatial_ref_sys(self) -> Any: ...
+    def modify_insert_params(self, placeholder: Any, params: Any) -> Any: ...
+    def get_geometry_converter(self, expression: Any) -> Any: ...
+    def get_area_att_for_field(self, field: Any) -> Any: ...

django-stubs/contrib/gis/db/backends/oracle/schema.pyi

@@ -0,0 +1,19 @@
+from typing import Any
+
+from django.db.backends.oracle.schema import DatabaseSchemaEditor
+
+class OracleGISSchemaEditor(DatabaseSchemaEditor):
+    sql_add_geometry_metadata: str = ...
+    sql_add_spatial_index: str = ...
+    sql_drop_spatial_index: str = ...
+    sql_clear_geometry_table_metadata: str = ...
+    sql_clear_geometry_field_metadata: str = ...
+    geometry_sql: Any = ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def geo_quote_name(self, name: Any) -> Any: ...
+    def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
+    def create_model(self, model: Any) -> None: ...
+    def delete_model(self, model: Any) -> None: ...
+    def add_field(self, model: Any, field: Any) -> None: ...
+    def remove_field(self, model: Any, field: Any) -> None: ...
+    def run_geometry_sql(self) -> None: ...