Mention solution to potential PYTHONPATH pitfall. (#115)

* remove psycopg2 from direct dependencies, only add it in tests

* bump to 1.0.1

* fix mypy

.gitignore

@@ -5,6 +5,7 @@ out/
 /django
 .idea/
 .mypy_cache/
-django-sources
 build/
-dist/
+dist/
+pip-wheel-metadata/
+.pytest_cache/

.gitmodules

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

.travis.yml

@@ -4,31 +4,38 @@ dist: xenial
 sudo: required
 jobs:
   include:
-    - name: Typecheck Django test suite
-      python: 3.7
-      script: 'python ./scripts/typecheck_tests.py'
-
     - name: Run plugin test suite with python 3.7
       python: 3.7
       script: |
         set -e
         pytest
 
+    - name: Typecheck Django test suite with python 3.7
+      python: 3.7
+      script: 'python ./scripts/typecheck_tests.py'
+
+    - name: Typecheck Django test suite with python 3.6
+      python: 3.6
+      script: 'python ./scripts/typecheck_tests.py'
+
+    - name: Mypy for plugin code
+      python: 3.7
+      script: 'mypy ./mypy_django_plugin'
+
     - name: Lint with black
       python: 3.7
       script: 'black --check --line-length=120 django-stubs/'
 
+    - name: Lint plugin code with flake8
+      python: 3.7
+      script: 'flake8'
+
+    - name: Lint plugin code with isort
+      python: 3.7
+      script: 'isort --check'
+
 before_install: |
   # Upgrade pip, setuptools, and wheel
   pip install -U pip setuptools wheel
 install: |
-  pip install -r ./dev-requirements.txt
-  pip install -r ./scripts/typecheck-tests-requirements.txt
-
-deploy:
-  provider: pypi
-  user: "mkurnikov"
-  password:
-    secure: 0E+hkaIdtpEtyL1KZeglunZ5/PKjouFfa8ljakAwoig7VNUL+2sO/bTyg38wRQl0NvzDzEHSMEt1bzg4Tq7b7Zp6nLuewG/w7mGLzqaOlTySiPEfRsg8s6uO2KrTn7g9VhlXH6UtyTXoQdMt6aE8+bt/GmEesanS57NB2mhwmylFgQwlJFu4LfIv/+aGmc4eLeGI2Qhvs9QYf7qvYlLQldgFh8mAckQEEvaBg35sf+puypZgf4nkx1k/dfG9wnFWZU8PJ41LbMw/Wj+k/9NpF8ePwiAr0fvRMErZd8nvoiWjQQjhzgrLVHhXEP5pTHh3zjDuGFMWyKuBhC6WLsG4qOQz/HvxeYvNI+jaTp15BgxtefG/pCNDUl/8GlCde7xVt7xzEcYNJSRaZPY2oofEFSd9qDnr4kqmyCXpNsaHRHvkL61bFjXUcfOsMMYvQCC6N2Jjb7S97RbnDdkOZO/lnFhVANT2rigsaXlSlWyN6f7ApxDNvu6Ehu5yrx6IjlPZJ0sI9vvY3IoS6Fik7w9E6zjNVjbmUn1D4MKFP4v5ppNASOqYcZeLd42j8rjEp0gIc3ccz9aUIT9q8VqSXSdUbqA6SVwvHXIVPxJMXj0bqWBG1iKs0cPBuzRVpRrwkENWCSWElDAewM1qFEnK0LppyoYFbqoQ8F5FG0+re7QttKQ=
-  on:
-    tags: true
+  pip install -r ./dev-requirements.txt

LICENSE.txt

@@ -1,27 +1,8 @@
 Copyright (c) Maxim Kurnikov.
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    3. Neither the name of Django nor the names of its contributors may be used
-       to endorse or promote products derived from this software without
-       specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -7,12 +7,20 @@
 
 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.
 
+Supports Python 3.6/3.7, and Django 2.1/2.2.
+
+Could be run on earlier versions of Django, but expect some missing imports warnings.
+
 ## Installation
 
 ```
 pip install django-stubs
 ```
 
+### WARNING: All configuration from pre-1.0.0 versions is dropped, use one below.
+
+### WARNING: 1.0.0 breaks `dmypy`, if you need it, stay on the 0.12.x series. 
+
 To make mypy aware of the plugin, you need to add
 
 ```
@@ -23,10 +31,41 @@ plugins =
 
 in your `mypy.ini` file.
 
-Also, it uses value of `DJANGO_SETTINGS_MODULE` from the environment, so set it before execution, otherwise some features will not work.
+Plugin requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified inside `mypy.ini` file.
+```
+[mypy]
+strict_optional = True
+
+; this one is new
+[mypy.plugins.django-stubs]
+django_settings_module = mysettings
+```
+where `mysettings` is a value of `DJANGO_SETTINGS_MODULE` (with or without quotes)
+
+Do you have trouble with mypy / the django plugin not finding your settings module? Try adding the root path of your project to your PYTHONPATH environment variable. If you use pipenv you can add the following to an `.env` file in your project root which pipenv will run automatically before executing any commands.:
+```
+PYTHONPATH=${PYTHONPATH}:${PWD}
+```
+
+New implementation uses Django runtime to extract models information, so it will crash, if your installed apps `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
+
+In other words, if your `manage.py runserver` crashes, mypy will crash too. 
+
+## Notes
+
+Implementation monkey-patches Django to add `__class_getitem__` to the `Manager` class. If you'd use Python3.7 and do that too in your code, you can make things like
+```
+class MyUserManager(models.Manager['MyUser']):
+    pass
+class MyUser(models.Model):
+    objects = UserManager()
+```
+work, which should make a error messages a bit better. 
+
+Otherwise, custom type will be created in mypy, named `MyUser__MyUserManager`, which will rewrite base manager as `models.Manager[User]` to make methods like `get_queryset()` and others return properly typed `QuerySet`. 
 
 ## 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.

dev-requirements.txt

@@ -1,3 +1,6 @@
 black
--e git+https://github.com/mkurnikov/pytest-mypy-plugins.git#egg=pytest-mypy-plugins
+pytest-mypy-plugins==1.0.3
+psycopg2
+flake8
+isort==4.3.4
 -e .

django-stubs/__init__.pyi

@@ -1,7 +1,12 @@
-from typing import Any
+from typing import Any, NamedTuple
 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/config.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Iterator, Type, Optional
+from typing import Any, Iterator, Type, Optional, Dict
 
 from django.db.models.base import Model
 
@@ -12,7 +12,7 @@ class AppConfig:
     verbose_name: str = ...
     path: str = ...
     models_module: None = ...
-    models: None = ...
+    models: Dict[str, Type[Model]] = ...
     def __init__(self, app_name: str, app_module: Optional[Any]) -> None: ...
     @classmethod
     def create(cls, entry: str) -> AppConfig: ...

django-stubs/apps/registry.pyi

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

django-stubs/conf/__init__.pyi

@@ -2,10 +2,16 @@ from typing import Any
 
 from django.utils.functional import LazyObject
 
+# explicit dependency on standard settings to make it loaded
+from . import global_settings
+
 ENVIRONMENT_VARIABLE: str = ...
+DEFAULT_CONTENT_TYPE_DEPRECATED_MSG: str = ...
+FILE_CHARSET_DEPRECATED_MSG: str = ...
 
 # required for plugin to be able to distinguish this specific instance of LazySettings from others
-class _DjangoConfLazyObject(LazyObject): ...
+class _DjangoConfLazyObject(LazyObject):
+    def __getattr__(self, item: Any) -> Any: ...
 
 class LazySettings(_DjangoConfLazyObject):
     configured: bool
@@ -18,3 +24,6 @@ class Settings:
     def is_overridden(self, setting: str) -> bool: ...
 
 class UserSettingsHolder: ...
+
+class SettingsReference(str):
+    def __init__(self, value: str, setting_name: str) -> None: ...

django-stubs/conf/global_settings.pyi

@@ -5,156 +5,64 @@ by the DJANGO_SETTINGS_MODULE environment variable.
 
 # This is defined here as a do-nothing function because we can't import
 # django.utils.translation -- that module depends on the settings.
-def gettext_noop(s):
-    return s
+from typing import Any, Dict, List, Optional, Pattern, Protocol, Sequence, Tuple, Union
 
 ####################
 # CORE             #
 ####################
-
-DEBUG = False
+DEBUG: bool = ...
 
 # Whether the framework should propagate raw exceptions rather than catching
 # them. This is useful under some testing situations and should never be used
 # on a live site.
-DEBUG_PROPAGATE_EXCEPTIONS = False
+DEBUG_PROPAGATE_EXCEPTIONS: bool = ...
 
 # People who get code error notifications.
 # In the format [('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com')]
-ADMINS = []
+ADMINS: List[Tuple[str, str]] = ...
 
 # List of IP addresses, as strings, that:
 #   * See debug comments, when DEBUG is true
 #   * Receive x-headers
-INTERNAL_IPS = []
+INTERNAL_IPS: List[str] = ...
 
 # Hosts/domain names that are valid for this site.
 # "*" matches anything, ".example.com" matches example.com and all subdomains
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS: List[str] = ...
 
 # Local time zone for this installation. All choices can be found here:
 # https://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
 # systems may support all possibilities). When USE_TZ is True, this is
 # interpreted as the default user time zone.
-TIME_ZONE = "America/Chicago"
+TIME_ZONE: str = ...
 
 # If you set this to True, Django will use timezone-aware datetimes.
-USE_TZ = False
+USE_TZ: bool = ...
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = "en-us"
+LANGUAGE_CODE: str = ...
 
 # Languages we provide translations for, out of the box.
-LANGUAGES = [
-    ("af", gettext_noop("Afrikaans")),
-    ("ar", gettext_noop("Arabic")),
-    ("ast", gettext_noop("Asturian")),
-    ("az", gettext_noop("Azerbaijani")),
-    ("bg", gettext_noop("Bulgarian")),
-    ("be", gettext_noop("Belarusian")),
-    ("bn", gettext_noop("Bengali")),
-    ("br", gettext_noop("Breton")),
-    ("bs", gettext_noop("Bosnian")),
-    ("ca", gettext_noop("Catalan")),
-    ("cs", gettext_noop("Czech")),
-    ("cy", gettext_noop("Welsh")),
-    ("da", gettext_noop("Danish")),
-    ("de", gettext_noop("German")),
-    ("dsb", gettext_noop("Lower Sorbian")),
-    ("el", gettext_noop("Greek")),
-    ("en", gettext_noop("English")),
-    ("en-au", gettext_noop("Australian English")),
-    ("en-gb", gettext_noop("British English")),
-    ("eo", gettext_noop("Esperanto")),
-    ("es", gettext_noop("Spanish")),
-    ("es-ar", gettext_noop("Argentinian Spanish")),
-    ("es-co", gettext_noop("Colombian Spanish")),
-    ("es-mx", gettext_noop("Mexican Spanish")),
-    ("es-ni", gettext_noop("Nicaraguan Spanish")),
-    ("es-ve", gettext_noop("Venezuelan Spanish")),
-    ("et", gettext_noop("Estonian")),
-    ("eu", gettext_noop("Basque")),
-    ("fa", gettext_noop("Persian")),
-    ("fi", gettext_noop("Finnish")),
-    ("fr", gettext_noop("French")),
-    ("fy", gettext_noop("Frisian")),
-    ("ga", gettext_noop("Irish")),
-    ("gd", gettext_noop("Scottish Gaelic")),
-    ("gl", gettext_noop("Galician")),
-    ("he", gettext_noop("Hebrew")),
-    ("hi", gettext_noop("Hindi")),
-    ("hr", gettext_noop("Croatian")),
-    ("hsb", gettext_noop("Upper Sorbian")),
-    ("hu", gettext_noop("Hungarian")),
-    ("ia", gettext_noop("Interlingua")),
-    ("id", gettext_noop("Indonesian")),
-    ("io", gettext_noop("Ido")),
-    ("is", gettext_noop("Icelandic")),
-    ("it", gettext_noop("Italian")),
-    ("ja", gettext_noop("Japanese")),
-    ("ka", gettext_noop("Georgian")),
-    ("kab", gettext_noop("Kabyle")),
-    ("kk", gettext_noop("Kazakh")),
-    ("km", gettext_noop("Khmer")),
-    ("kn", gettext_noop("Kannada")),
-    ("ko", gettext_noop("Korean")),
-    ("lb", gettext_noop("Luxembourgish")),
-    ("lt", gettext_noop("Lithuanian")),
-    ("lv", gettext_noop("Latvian")),
-    ("mk", gettext_noop("Macedonian")),
-    ("ml", gettext_noop("Malayalam")),
-    ("mn", gettext_noop("Mongolian")),
-    ("mr", gettext_noop("Marathi")),
-    ("my", gettext_noop("Burmese")),
-    ("nb", gettext_noop("Norwegian Bokmål")),
-    ("ne", gettext_noop("Nepali")),
-    ("nl", gettext_noop("Dutch")),
-    ("nn", gettext_noop("Norwegian Nynorsk")),
-    ("os", gettext_noop("Ossetic")),
-    ("pa", gettext_noop("Punjabi")),
-    ("pl", gettext_noop("Polish")),
-    ("pt", gettext_noop("Portuguese")),
-    ("pt-br", gettext_noop("Brazilian Portuguese")),
-    ("ro", gettext_noop("Romanian")),
-    ("ru", gettext_noop("Russian")),
-    ("sk", gettext_noop("Slovak")),
-    ("sl", gettext_noop("Slovenian")),
-    ("sq", gettext_noop("Albanian")),
-    ("sr", gettext_noop("Serbian")),
-    ("sr-latn", gettext_noop("Serbian Latin")),
-    ("sv", gettext_noop("Swedish")),
-    ("sw", gettext_noop("Swahili")),
-    ("ta", gettext_noop("Tamil")),
-    ("te", gettext_noop("Telugu")),
-    ("th", gettext_noop("Thai")),
-    ("tr", gettext_noop("Turkish")),
-    ("tt", gettext_noop("Tatar")),
-    ("udm", gettext_noop("Udmurt")),
-    ("uk", gettext_noop("Ukrainian")),
-    ("ur", gettext_noop("Urdu")),
-    ("vi", gettext_noop("Vietnamese")),
-    ("zh-hans", gettext_noop("Simplified Chinese")),
-    ("zh-hant", gettext_noop("Traditional Chinese")),
-]
+LANGUAGES: List[Tuple[str, str]] = ...
 
 # Languages using BiDi (right-to-left) layout
-LANGUAGES_BIDI = ["he", "ar", "fa", "ur"]
+LANGUAGES_BIDI: List[str] = ...
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
-USE_I18N = True
-LOCALE_PATHS = []
+USE_I18N: bool = ...
+LOCALE_PATHS: List[str] = ...
 
 # Settings for language cookie
-LANGUAGE_COOKIE_NAME = "django_language"
-LANGUAGE_COOKIE_AGE = None
-LANGUAGE_COOKIE_DOMAIN = None
-LANGUAGE_COOKIE_PATH = "/"
+LANGUAGE_COOKIE_NAME: str = ...
+LANGUAGE_COOKIE_AGE: Optional[int] = ...
+LANGUAGE_COOKIE_DOMAIN: Optional[str] = ...
+LANGUAGE_COOKIE_PATH: str = ...
 
 # If you set this to True, Django will format dates, numbers and calendars
 # according to user current locale.
-USE_L10N = False
+USE_L10N: bool = ...
 
 # Not-necessarily-technical managers of the site. They get broken link
 # notifications and other various emails.
@@ -163,66 +71,69 @@ MANAGERS = ADMINS
 # Default content type and 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 = "text/html"
-DEFAULT_CHARSET = "utf-8"
+DEFAULT_CONTENT_TYPE: str = ...
+DEFAULT_CHARSET: str = ...
 
 # Encoding of files read from disk (template and initial SQL files).
-FILE_CHARSET = "utf-8"
+FILE_CHARSET: str = ...
 
 # Email address that error messages come from.
-SERVER_EMAIL = "root@localhost"
+SERVER_EMAIL: str = ...
 
 # Database connection info. If left empty, will default to the dummy backend.
-DATABASES = {}
+DATABASES: Dict[str, Dict[str, Any]] = ...
 
 # Classes used to implement DB routing behavior.
-DATABASE_ROUTERS = []
+class Router(Protocol):
+    def allow_migrate(self, db, app_label, **hints): ...
+
+DATABASE_ROUTERS: List[Union[str, Router]] = ...
 
 # The email backend to use. For possible shortcuts see django.core.mail.
 # The default is to use the SMTP backend.
 # Third-party backends can be specified by providing a Python path
 # to a module that defines an EmailBackend class.
-EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+EMAIL_BACKEND: str = ...
 
 # Host for sending email.
-EMAIL_HOST = "localhost"
+EMAIL_HOST: str = ...
 
 # Port for sending email.
-EMAIL_PORT = 25
+EMAIL_PORT: int = ...
 
 # Whether to send SMTP 'Date' header in the local time zone or in UTC.
-EMAIL_USE_LOCALTIME = False
+EMAIL_USE_LOCALTIME: bool = ...
 
 # Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ""
-EMAIL_HOST_PASSWORD = ""
-EMAIL_USE_TLS = False
-EMAIL_USE_SSL = False
-EMAIL_SSL_CERTFILE = None
-EMAIL_SSL_KEYFILE = None
-EMAIL_TIMEOUT = None
+EMAIL_HOST_USER: str = ...
+EMAIL_HOST_PASSWORD: str = ...
+EMAIL_USE_TLS: bool = ...
+EMAIL_USE_SSL: bool = ...
+EMAIL_SSL_CERTFILE: Optional[str] = ...
+EMAIL_SSL_KEYFILE: Optional[str] = ...
+EMAIL_TIMEOUT: Optional[int] = ...
 
 # List of strings representing installed apps.
-INSTALLED_APPS = []
+INSTALLED_APPS: List[str] = ...
 
-TEMPLATES = []
+TEMPLATES: List[Dict[str, Any]] = ...
 
 # Default form rendering class.
-FORM_RENDERER = "django.forms.renderers.DjangoTemplates"
+FORM_RENDERER: str = ...
 
 # Default email address to use for various automated correspondence from
 # the site managers.
-DEFAULT_FROM_EMAIL = "webmaster@localhost"
+DEFAULT_FROM_EMAIL: str = ...
 
 # Subject-line prefix for email messages send with django.core.mail.mail_admins
 # or ...mail_managers.  Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = "[Django] "
+EMAIL_SUBJECT_PREFIX: str = ...
 
 # Whether to append trailing slashes to URLs.
-APPEND_SLASH = True
+APPEND_SLASH: bool = ...
 
 # Whether to prepend the "www." subdomain to URLs that don't have it.
-PREPEND_WWW = False
+PREPEND_WWW: bool = ...
 
 # Override the server-derived value of SCRIPT_NAME
 FORCE_SCRIPT_NAME = None
@@ -237,9 +148,9 @@ FORCE_SCRIPT_NAME = None
 #         re.compile(r'^SiteSucker.*'),
 #         re.compile(r'^sohu-search'),
 #     ]
-DISALLOWED_USER_AGENTS = []
+DISALLOWED_USER_AGENTS: List[Pattern] = ...
 
-ABSOLUTE_URL_OVERRIDES = {}
+ABSOLUTE_URL_OVERRIDES: Dict[str, Any] = ...
 
 # List of compiled regular expression objects representing URLs that need not
 # be reported by BrokenLinkEmailsMiddleware. Here are a few examples:
@@ -251,54 +162,51 @@ ABSOLUTE_URL_OVERRIDES = {}
 #        re.compile(r'^/phpmyadmin/'),
 #        re.compile(r'\.(cgi|php|pl)$'),
 #    ]
-IGNORABLE_404_URLS = []
+IGNORABLE_404_URLS: List[Pattern] = ...
 
 # A secret key for this particular Django installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Django will complain
 # loudly.
-SECRET_KEY = ""
+SECRET_KEY: str = ...
 
 # Default file storage mechanism that holds media.
-DEFAULT_FILE_STORAGE = "django.core.files.storage.FileSystemStorage"
+DEFAULT_FILE_STORAGE: str = ...
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/var/www/example.com/media/"
-MEDIA_ROOT = ""
+MEDIA_ROOT: str = ...
 
 # URL that handles the media served from MEDIA_ROOT.
 # Examples: "http://example.com/media/", "http://media.example.com/"
-MEDIA_URL = ""
+MEDIA_URL: str = ...
 
 # Absolute path to the directory static files should be collected to.
 # Example: "/var/www/example.com/static/"
-STATIC_ROOT = None
+STATIC_ROOT: Optional[str] = ...
 
 # URL that handles the static files served from STATIC_ROOT.
 # Example: "http://example.com/static/", "http://static.example.com/"
-STATIC_URL = None
+STATIC_URL: Optional[str] = ...
 
 # List of upload handler classes to be applied in order.
-FILE_UPLOAD_HANDLERS = [
-    "django.core.files.uploadhandler.MemoryFileUploadHandler",
-    "django.core.files.uploadhandler.TemporaryFileUploadHandler",
-]
+FILE_UPLOAD_HANDLERS: List[str] = ...
 
 # Maximum size, in bytes, of a request before it will be streamed to the
 # file system instead of into memory.
-FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440  # i.e. 2.5 MB
+FILE_UPLOAD_MAX_MEMORY_SIZE: int = ...  # i.e. 2.5 MB
 
 # Maximum size in bytes of request data (excluding file uploads) that will be
 # read before a SuspiciousOperation (RequestDataTooBig) is raised.
-DATA_UPLOAD_MAX_MEMORY_SIZE = 2621440  # i.e. 2.5 MB
+DATA_UPLOAD_MAX_MEMORY_SIZE: int = ...  # i.e. 2.5 MB
 
 # Maximum number of GET/POST parameters that will be read before a
 # SuspiciousOperation (TooManyFieldsSent) is raised.
-DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000
+DATA_UPLOAD_MAX_NUMBER_FIELDS: int = ...
 
 # Directory in which upload streamed files will be temporarily saved. A value of
 # `None` will make Django use the operating system's default temporary directory
 # (i.e. "/tmp" on *nix systems).
-FILE_UPLOAD_TEMP_DIR = None
+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.
@@ -313,116 +221,91 @@ FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
 # The directory where this setting is pointing should contain subdirectories
 # named as the locales, containing a formats.py file
 # (i.e. "myproject.locale" for myproject/locale/en/formats.py etc. use)
-FORMAT_MODULE_PATH = None
+FORMAT_MODULE_PATH: Optional[str] = ...
 
 # Default formatting for date objects. See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = "N j, Y"
+DATE_FORMAT: str = ...
 
 # Default formatting for datetime objects. See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATETIME_FORMAT = "N j, Y, P"
+DATETIME_FORMAT: str = ...
 
 # Default formatting for time objects. See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-TIME_FORMAT = "P"
+TIME_FORMAT: str = ...
 
 # Default formatting for date objects when only the year and month are relevant.
 # See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-YEAR_MONTH_FORMAT = "F Y"
+YEAR_MONTH_FORMAT: str = ...
 
 # Default formatting for date objects when only the month and day are relevant.
 # See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-MONTH_DAY_FORMAT = "F j"
+MONTH_DAY_FORMAT: str = ...
 
 # Default short formatting for date objects. See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-SHORT_DATE_FORMAT = "m/d/Y"
+SHORT_DATE_FORMAT: str = ...
 
 # Default short formatting for datetime objects.
 # See all available format strings here:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-SHORT_DATETIME_FORMAT = "m/d/Y P"
+SHORT_DATETIME_FORMAT: str = ...
 
 # Default formats to be used when parsing dates from input boxes, in order
 # See all available format string here:
 # https://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-DATE_INPUT_FORMATS = [
-    "%Y-%m-%d",
-    "%m/%d/%Y",
-    "%m/%d/%y",  # '2006-10-25', '10/25/2006', '10/25/06'
-    "%b %d %Y",
-    "%b %d, %Y",  # 'Oct 25 2006', 'Oct 25, 2006'
-    "%d %b %Y",
-    "%d %b, %Y",  # '25 Oct 2006', '25 Oct, 2006'
-    "%B %d %Y",
-    "%B %d, %Y",  # 'October 25 2006', 'October 25, 2006'
-    "%d %B %Y",
-    "%d %B, %Y",  # '25 October 2006', '25 October, 2006'
-]
+DATE_INPUT_FORMATS: List[str] = ...
 
 # Default formats to be used when parsing times from input boxes, in order
 # See all available format string here:
 # https://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-TIME_INPUT_FORMATS = ["%H:%M:%S", "%H:%M:%S.%f", "%H:%M"]  # '14:30:59'  # '14:30:59.000200'  # '14:30'
+TIME_INPUT_FORMATS: List[str] = ...  # '14:30:59'  # '14:30:59.000200'  # '14:30'
 
 # Default formats to be used when parsing dates and times from input boxes,
 # in order
 # See all available format string here:
 # https://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-DATETIME_INPUT_FORMATS = [
-    "%Y-%m-%d %H:%M:%S",  # '2006-10-25 14:30:59'
-    "%Y-%m-%d %H:%M:%S.%f",  # '2006-10-25 14:30:59.000200'
-    "%Y-%m-%d %H:%M",  # '2006-10-25 14:30'
-    "%Y-%m-%d",  # '2006-10-25'
-    "%m/%d/%Y %H:%M:%S",  # '10/25/2006 14:30:59'
-    "%m/%d/%Y %H:%M:%S.%f",  # '10/25/2006 14:30:59.000200'
-    "%m/%d/%Y %H:%M",  # '10/25/2006 14:30'
-    "%m/%d/%Y",  # '10/25/2006'
-    "%m/%d/%y %H:%M:%S",  # '10/25/06 14:30:59'
-    "%m/%d/%y %H:%M:%S.%f",  # '10/25/06 14:30:59.000200'
-    "%m/%d/%y %H:%M",  # '10/25/06 14:30'
-    "%m/%d/%y",  # '10/25/06'
-]
+DATETIME_INPUT_FORMATS: List[str] = ...
 
 # First day of week, to be used on calendars
 # 0 means Sunday, 1 means Monday...
-FIRST_DAY_OF_WEEK = 0
+FIRST_DAY_OF_WEEK: int = ...
 
 # Decimal separator symbol
-DECIMAL_SEPARATOR = "."
+DECIMAL_SEPARATOR: str = ...
 
 # Boolean that sets whether to add thousand separator when formatting numbers
-USE_THOUSAND_SEPARATOR = False
+USE_THOUSAND_SEPARATOR: bool = ...
 
 # Number of digits that will be together, when splitting them by
 # THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
-NUMBER_GROUPING = 0
+NUMBER_GROUPING: int = ...
 
 # Thousand separator symbol
-THOUSAND_SEPARATOR = ","
+THOUSAND_SEPARATOR: str = ...
 
 # The tablespaces to use for each model when not specified otherwise.
-DEFAULT_TABLESPACE = ""
-DEFAULT_INDEX_TABLESPACE = ""
+DEFAULT_TABLESPACE: str = ...
+DEFAULT_INDEX_TABLESPACE: str = ...
 
 # Default X-Frame-Options header value
-X_FRAME_OPTIONS = "SAMEORIGIN"
+X_FRAME_OPTIONS: str = ...
 
-USE_X_FORWARDED_HOST = False
-USE_X_FORWARDED_PORT = False
+USE_X_FORWARDED_HOST: bool = ...
+USE_X_FORWARDED_PORT: bool = ...
 
 # The Python dotted path to the WSGI application that Django's internal server
 # (runserver) will use. If `None`, the return value of
 # 'django.core.wsgi.get_wsgi_application' is used, thus preserving the same
 # behavior as previous versions of Django. Otherwise this should point to an
 # actual WSGI application object.
-WSGI_APPLICATION = None
+WSGI_APPLICATION: Optional[str] = ...
 
 # If your Django app is behind a proxy that sets a header to specify secure
 # connections, AND that proxy ensures that user-submitted headers with the
@@ -431,7 +314,7 @@ WSGI_APPLICATION = None
 # that header/value, request.is_secure() will return True.
 # WARNING! Only set this if you fully understand what you're doing. Otherwise,
 # you may be opening yourself up to a security risk.
-SECURE_PROXY_SSL_HEADER = None
+SECURE_PROXY_SSL_HEADER: Optional[Tuple[str, str]] = ...
 
 ##############
 # MIDDLEWARE #
@@ -440,7 +323,7 @@ SECURE_PROXY_SSL_HEADER = None
 # List of middleware to use. Order is important; in the request phase, these
 # middleware will be applied in the order given, and in the response
 # phase the middleware will be applied in reverse order.
-MIDDLEWARE = []
+MIDDLEWARE: List[str] = ...
 
 ############
 # SESSIONS #
@@ -453,7 +336,7 @@ SESSION_COOKIE_NAME = "sessionid"
 # Age of cookie, in seconds (default: 2 weeks).
 SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2
 # A string like "example.com", or None for standard domain cookie.
-SESSION_COOKIE_DOMAIN = None
+SESSION_COOKIE_DOMAIN: Optional[str] = ...
 # Whether the session cookie should be secure (https:// only).
 SESSION_COOKIE_SECURE = False
 # The path of the session cookie.
@@ -471,7 +354,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 SESSION_ENGINE = "django.contrib.sessions.backends.db"
 # Directory to store session files if using the file session module. If None,
 # the backend will use a sensible default.
-SESSION_FILE_PATH = None
+SESSION_FILE_PATH: Optional[str] = ...
 # class to serialize session data
 SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"
 
@@ -480,7 +363,7 @@ SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"
 #########
 
 # The cache backends to use.
-CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
+CACHES: Dict[str, Dict[str, Any]] = ...
 CACHE_MIDDLEWARE_KEY_PREFIX = ""
 CACHE_MIDDLEWARE_SECONDS = 600
 CACHE_MIDDLEWARE_ALIAS = "default"
@@ -489,15 +372,15 @@ CACHE_MIDDLEWARE_ALIAS = "default"
 # AUTHENTICATION #
 ##################
 
-AUTH_USER_MODEL = "auth.User"
+AUTH_USER_MODEL: str = ...
 
-AUTHENTICATION_BACKENDS = ["django.contrib.auth.backends.ModelBackend"]
+AUTHENTICATION_BACKENDS: Sequence[str] = ...
 
 LOGIN_URL = "/accounts/login/"
 
-LOGIN_REDIRECT_URL = "/accounts/profile/"
+LOGIN_REDIRECT_URL: str = ...
 
-LOGOUT_REDIRECT_URL = None
+LOGOUT_REDIRECT_URL: Optional[str] = ...
 
 # The number of days a password reset link is valid for
 PASSWORD_RESET_TIMEOUT_DAYS = 3
@@ -505,14 +388,9 @@ PASSWORD_RESET_TIMEOUT_DAYS = 3
 # the first hasher in this list is the preferred algorithm.  any
 # password using different algorithms will be converted automatically
 # upon login
-PASSWORD_HASHERS = [
-    "django.contrib.auth.hashers.PBKDF2PasswordHasher",
-    "django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
-    "django.contrib.auth.hashers.Argon2PasswordHasher",
-    "django.contrib.auth.hashers.BCryptSHA256PasswordHasher",
-]
+PASSWORD_HASHERS: List[str] = ...
 
-AUTH_PASSWORD_VALIDATORS = []
+AUTH_PASSWORD_VALIDATORS: List[Dict[str, str]] = ...
 
 ###########
 # SIGNING #
@@ -537,7 +415,7 @@ CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
 CSRF_COOKIE_SAMESITE = "Lax"
 CSRF_HEADER_NAME = "HTTP_X_CSRFTOKEN"
-CSRF_TRUSTED_ORIGINS = []
+CSRF_TRUSTED_ORIGINS: List[str] = ...
 CSRF_USE_SESSIONS = False
 
 ############
@@ -558,7 +436,7 @@ MESSAGE_STORAGE = "django.contrib.messages.storage.fallback.FallbackStorage"
 LOGGING_CONFIG = "logging.config.dictConfig"
 
 # Custom logging configuration.
-LOGGING = {}
+LOGGING: Dict[str, Any] = ...
 
 # Default exception reporter filter class used in case none has been
 # specifically assigned to the HttpRequest instance.
@@ -573,39 +451,35 @@ TEST_RUNNER = "django.test.runner.DiscoverRunner"
 
 # Apps that don't need to be serialized at test database creation time
 # (only apps with migrations are to start with)
-TEST_NON_SERIALIZED_APPS = []
+TEST_NON_SERIALIZED_APPS: List[str] = ...
 
 ############
 # FIXTURES #
 ############
 
 # The list of directories to search for fixtures
-FIXTURE_DIRS = []
+FIXTURE_DIRS: List[str] = ...
 
 ###############
 # STATICFILES #
 ###############
 
 # A list of locations of additional static files
-STATICFILES_DIRS = []
+STATICFILES_DIRS: List[str] = ...
 
 # The default file storage backend used during the build process
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.StaticFilesStorage"
+STATICFILES_STORAGE: str = ...
 
 # List of finder classes that know how to find static files in
 # various locations.
-STATICFILES_FINDERS = [
-    "django.contrib.staticfiles.finders.FileSystemFinder",
-    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
-    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-]
+STATICFILES_FINDERS: List[str] = ...
 
 ##############
 # MIGRATIONS #
 ##############
 
 # Migration module overrides for apps, by app label.
-MIGRATION_MODULES = {}
+MIGRATION_MODULES: Dict[str, str] = ...
 
 #################
 # SYSTEM CHECKS #
@@ -615,7 +489,7 @@ MIGRATION_MODULES = {}
 # issues like warnings, infos or debugs will not generate a message. Silencing
 # serious issues like errors and criticals does not result in hiding the
 # message, but Django will not stop you from e.g. running server.
-SILENCED_SYSTEM_CHECKS = []
+SILENCED_SYSTEM_CHECKS: List[str] = ...
 
 #######################
 # SECURITY MIDDLEWARE #
@@ -625,6 +499,6 @@ SECURE_CONTENT_TYPE_NOSNIFF = False
 SECURE_HSTS_INCLUDE_SUBDOMAINS = False
 SECURE_HSTS_PRELOAD = False
 SECURE_HSTS_SECONDS = 0
-SECURE_REDIRECT_EXEMPT = []
+SECURE_REDIRECT_EXEMPT: List[str] = ...
 SECURE_SSL_HOST = None
 SECURE_SSL_REDIRECT = False

django-stubs/conf/locale/__init__.pyi

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

django-stubs/conf/urls/__init__.pyi

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

django-stubs/contrib/admin/apps.pyi

@@ -1,25 +1,6 @@
-from typing import Any
-
 from django.apps import AppConfig
 
 class SimpleAdminConfig(AppConfig):
-    apps: None
-    label: str
-    models: None
-    models_module: None
-    module: Any
-    path: str
     default_site: str = ...
-    name: str = ...
-    verbose_name: Any = ...
-    def ready(self) -> None: ...
 
-class AdminConfig(SimpleAdminConfig):
-    apps: None
-    label: str
-    models: None
-    models_module: None
-    module: Any
-    name: str
-    path: str
-    def ready(self) -> None: ...
+class AdminConfig(SimpleAdminConfig): ...

django-stubs/contrib/admin/filters.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Iterator
 
 from django.contrib.admin.options import ModelAdmin
 from django.core.handlers.wsgi import WSGIRequest
@@ -16,7 +16,7 @@ class ListFilter:
         self, request: WSGIRequest, params: Dict[str, str], model: Type[Model], model_admin: ModelAdmin
     ) -> None: ...
     def has_output(self) -> bool: ...
-    def choices(self, changelist: Any) -> None: ...
+    def choices(self, changelist: Any) -> Optional[Iterator[Dict[str, Any]]]: ...
     def queryset(self, request: Any, queryset: QuerySet) -> Optional[QuerySet]: ...
     def expected_parameters(self) -> Optional[List[str]]: ...
 

django-stubs/contrib/admin/forms.pyi

@@ -1,33 +1,7 @@
-from typing import Any, Dict
-
 from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm
-from django.contrib.auth.models import User
 
 class AdminAuthenticationForm(AuthenticationForm):
-    auto_id: str
-    data: Dict[str, str]
-    empty_permitted: bool
-    error_class: type
-    fields: Dict[Any, Any]
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
-    request: None
-    user_cache: None
-    error_messages: Any = ...
     required_css_class: str = ...
-    def confirm_login_allowed(self, user: User) -> None: ...
 
 class AdminPasswordChangeForm(PasswordChangeForm):
-    auto_id: str
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: type
-    fields: Dict[Any, Any]
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
-    user: Any
     required_css_class: str = ...

django-stubs/contrib/admin/helpers.pyi

@@ -1,27 +1,17 @@
-import collections
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union, Type
+from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
-from django import forms
 from django.contrib.auth.forms import AdminPasswordChangeForm
-from django.db.models.fields import AutoField
-from django.forms.utils import ErrorDict, ErrorList
+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 django.forms.boundfield import BoundField
+from django import forms
+from django.db.models.fields import AutoField
 
 ACTION_CHECKBOX_NAME: str
 
 class ActionForm(forms.Form):
-    auto_id: None
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
     action: Any = ...
     select_across: Any = ...
 
@@ -36,8 +26,8 @@ class AdminForm:
         form: AdminPasswordChangeForm,
         fieldsets: List[Tuple[None, Dict[str, List[str]]]],
         prepopulated_fields: Dict[Any, Any],
-        readonly_fields: None = ...,
-        model_admin: None = ...,
+        readonly_fields: Any = ...,
+        model_admin: Any = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Fieldset]: ...
     @property
@@ -137,7 +127,6 @@ class InlineAdminFormSet:
 
 class InlineAdminForm(AdminForm):
     formset: Any = ...
-    model_admin: Any = ...
     original: Any = ...
     show_url: Any = ...
     absolute_url: Any = ...
@@ -152,7 +141,6 @@ class InlineAdminForm(AdminForm):
         model_admin: Optional[Any] = ...,
         view_on_site_url: Optional[Any] = ...,
     ) -> 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: ...
@@ -162,9 +150,6 @@ class InlineAdminForm(AdminForm):
 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):
-    data: List[Any]
-    error_class: str
     def __init__(self, form: Any, inline_formsets: Any) -> None: ...

django-stubs/contrib/admin/models.pyi

@@ -1,20 +1,17 @@
-import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 from uuid import UUID
 
-from django.db import models
+from django.contrib.contenttypes.models import ContentType
 from django.db.models.base import Model
 
+from django.db import models
+
 ADDITION: int
 CHANGE: int
 DELETION: int
 ACTION_FLAG_CHOICES: Any
 
-class LogEntryManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
+class LogEntryManager(models.Manager["LogEntry"]):
     def log_action(
         self,
         user_id: int,
@@ -22,28 +19,18 @@ class LogEntryManager(models.Manager):
         object_id: Union[int, str, UUID],
         object_repr: str,
         action_flag: int,
-        change_message: Union[
-            Dict[str, Dict[str, List[str]]], List[Dict[str, Dict[str, Union[List[str], str]]]], str
-        ] = ...,
+        change_message: Any = ...,
     ) -> LogEntry: ...
 
 class LogEntry(models.Model):
-    content_type_id: int
-    id: None
-    user_id: int
-    action_time: datetime.datetime = ...
-    user: Any = ...
-    content_type: Any = ...
-    object_id: str = ...
-    object_repr: str = ...
-    action_flag: int = ...
-    change_message: str = ...
-    objects: Any = ...
-    class Meta:
-        verbose_name: Any = ...
-        verbose_name_plural: Any = ...
-        db_table: str = ...
-        ordering: Any = ...
+    action_time: models.DateTimeField = ...
+    user: models.ForeignKey = ...
+    content_type: models.ForeignKey = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    object_id: models.TextField = ...
+    object_repr: models.CharField = ...
+    action_flag: models.PositiveSmallIntegerField = ...
+    change_message: models.TextField = ...
+    objects: LogEntryManager = ...
     def is_addition(self) -> bool: ...
     def is_change(self) -> bool: ...
     def is_deletion(self) -> bool: ...

django-stubs/contrib/admin/options.pyi

@@ -1,13 +1,13 @@
 from collections import OrderedDict
-from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Type, Union
+from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union
 
+from django.contrib.admin.filters import 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.handlers.wsgi import WSGIRequest
 from django.core.paginator import Paginator
 from django.db.models.base import Model
 from django.db.models.fields.related import ForeignKey, ManyToManyField, RelatedField
@@ -16,12 +16,13 @@ from django.db.models.query import QuerySet
 from django.forms.fields import TypedChoiceField
 from django.forms.models import ModelChoiceField, 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.urls.resolvers import URLPattern
 from django.utils.safestring import SafeText
 
 from django.db.models.fields import Field
-from django.template.response import TemplateResponse
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str
@@ -56,58 +57,59 @@ class BaseModelAdmin:
     checks_class: Any = ...
     def check(self, **kwargs: Any) -> List[Union[str, Error]]: ...
     def __init__(self) -> None: ...
-    def formfield_for_dbfield(self, db_field: Field, request: WSGIRequest, **kwargs: Any) -> Optional[Field]: ...
-    def formfield_for_choice_field(self, db_field: Field, request: WSGIRequest, **kwargs: Any) -> TypedChoiceField: ...
-    def get_field_queryset(self, db: None, db_field: RelatedField, request: WSGIRequest) -> Optional[QuerySet]: ...
+    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: ...
+    def get_field_queryset(
+        self, db: None, db_field: RelatedField, request: Optional[HttpRequest]
+    ) -> Optional[QuerySet]: ...
     def formfield_for_foreignkey(
-        self, db_field: ForeignKey, request: WSGIRequest, **kwargs: Any
+        self, db_field: ForeignKey, request: Optional[HttpRequest], **kwargs: Any
     ) -> Optional[ModelChoiceField]: ...
     def formfield_for_manytomany(
-        self, db_field: ManyToManyField, request: WSGIRequest, **kwargs: Any
+        self, db_field: ManyToManyField, request: Optional[HttpRequest], **kwargs: Any
     ) -> ModelMultipleChoiceField: ...
-    def get_autocomplete_fields(self, request: WSGIRequest) -> Tuple: ...
+    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: WSGIRequest, obj: Optional[Model] = ...) -> None: ...
-    def get_fields(
-        self, request: WSGIRequest, obj: Optional[Model] = ...
-    ) -> Union[List[Union[Callable, str]], Tuple[str, str]]: ...
+    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: WSGIRequest, obj: Optional[Model] = ...
-    ) -> Union[
-        List[Tuple[None, Dict[str, List[Union[Callable, str]]]]],
-        Tuple[Tuple[Optional[str], Dict[str, Tuple[Union[Tuple[str, str], str]]]]],
-    ]: ...
-    def get_ordering(self, request: WSGIRequest) -> Union[List[str], Tuple]: ...
-    def get_readonly_fields(self, request: WSGIRequest, obj: Optional[Model] = ...) -> Union[List[str], Tuple]: ...
-    def get_prepopulated_fields(self, request: WSGIRequest, obj: Optional[Model] = ...) -> Dict[str, Tuple[str]]: ...
-    def get_queryset(self, request: WSGIRequest) -> QuerySet: ...
-    def get_sortable_by(self, request: WSGIRequest) -> Union[List[Callable], List[str], Tuple]: ...
+        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]: ...
     def lookup_allowed(self, lookup: str, value: str) -> bool: ...
-    def to_field_allowed(self, request: WSGIRequest, to_field: str) -> bool: ...
-    def has_add_permission(self, request: WSGIRequest) -> bool: ...
-    def has_change_permission(self, request: WSGIRequest, obj: Optional[Model] = ...) -> bool: ...
-    def has_delete_permission(self, request: WSGIRequest, obj: Optional[Model] = ...) -> bool: ...
-    def has_view_permission(self, request: WSGIRequest, obj: Optional[Model] = ...) -> bool: ...
-    def has_module_permission(self, request: WSGIRequest) -> bool: ...
+    def to_field_allowed(self, request: HttpRequest, to_field: str) -> bool: ...
+    def has_add_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
+    def has_change_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
+    def has_delete_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
+    def has_view_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
+    def has_module_permission(self, request: HttpRequest) -> bool: ...
 
 class ModelAdmin(BaseModelAdmin):
     formfield_overrides: Any
-    list_display: Sequence[str] = ...
-    list_display_links: Sequence[str] = ...
-    list_filter: Sequence[str] = ...
-    list_select_related: Sequence[str] = ...
+    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]]]] = ...
+    list_select_related: Union[bool, Sequence[str]] = ...
     list_per_page: int = ...
     list_max_show_all: int = ...
     list_editable: Sequence[str] = ...
-    search_fields: Any = ...
-    date_hierarchy: Any = ...
+    search_fields: Sequence[str] = ...
+    date_hierarchy: Optional[Any] = ...
     save_as: bool = ...
     save_as_continue: bool = ...
     save_on_top: bool = ...
     paginator: Any = ...
     preserve_filters: bool = ...
-    inlines: Any = ...
+    inlines: Sequence[Type[InlineModelAdmin]] = ...
     add_form_template: Any = ...
     change_form_template: Any = ...
     change_list_template: Any = ...
@@ -125,64 +127,54 @@ class ModelAdmin(BaseModelAdmin):
     opts: Options = ...
     admin_site: AdminSite = ...
     def __init__(self, model: Type[Model], admin_site: Optional[AdminSite]) -> None: ...
-    def get_inline_instances(self, request: WSGIRequest, obj: Optional[Model] = ...) -> List[InlineModelAdmin]: ...
+    def get_inline_instances(self, request: HttpRequest, obj: Optional[Model] = ...) -> 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: WSGIRequest) -> Dict[str, bool]: ...
+    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_changelist(self, request: WSGIRequest, **kwargs: Any) -> Type[ChangeList]: ...
-    def get_changelist_instance(self, request: WSGIRequest) -> ChangeList: ...
-    def get_object(self, request: WSGIRequest, object_id: str, from_field: None = ...) -> Optional[Model]: ...
+    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: WSGIRequest, obj: Optional[Model] = ...) -> None: ...
+    def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[Model] = ...) -> Iterator[Any]: ...
     def get_paginator(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         queryset: QuerySet,
         per_page: int,
         orphans: int = ...,
         allow_empty_first_page: bool = ...,
     ) -> Paginator: ...
-    def log_addition(
-        self,
-        request: WSGIRequest,
-        object: Model,
-        message: Union[Dict[str, Dict[Any, Any]], List[Dict[str, Dict[str, str]]]],
-    ) -> LogEntry: ...
-    def log_change(
-        self,
-        request: WSGIRequest,
-        object: Model,
-        message: Union[Dict[str, Dict[str, List[str]]], List[Dict[str, Dict[str, Union[List[str], str]]]]],
-    ) -> LogEntry: ...
-    def log_deletion(self, request: WSGIRequest, object: Model, object_repr: str) -> LogEntry: ...
+    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: WSGIRequest) -> OrderedDict: ...
+    def get_actions(self, request: HttpRequest) -> OrderedDict: ...
     def get_action_choices(
-        self, request: WSGIRequest, default_choices: List[Tuple[str, str]] = ...
+        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: WSGIRequest) -> Sequence[str]: ...
-    def get_list_display_links(self, request: WSGIRequest, list_display: Sequence[str]) -> Optional[Sequence[str]]: ...
-    def get_list_filter(self, request: WSGIRequest) -> Sequence[str]: ...
-    def get_list_select_related(self, request: WSGIRequest) -> Sequence[str]: ...
-    def get_search_fields(self, request: WSGIRequest) -> List[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_search_results(
-        self, request: WSGIRequest, queryset: QuerySet, search_term: str
+        self, request: HttpRequest, queryset: QuerySet, search_term: str
     ) -> Tuple[QuerySet, bool]: ...
-    def get_preserved_filters(self, request: WSGIRequest) -> str: ...
-    def _get_edited_object_pks(self, request: WSGIRequest, prefix: str) -> List[str]: ...
-    def _get_list_editable_queryset(self, request: WSGIRequest, prefix: str) -> QuerySet: ...
+    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 construct_change_message(
-        self, request: WSGIRequest, form: AdminPasswordChangeForm, formsets: None, add: bool = ...
+        self, request: HttpRequest, form: AdminPasswordChangeForm, formsets: None, add: bool = ...
     ) -> List[Dict[str, Dict[str, List[str]]]]: ...
     def message_user(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         message: str,
         level: Union[int, str] = ...,
         extra_tags: str = ...,
@@ -190,8 +182,8 @@ class ModelAdmin(BaseModelAdmin):
     ) -> 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: WSGIRequest, obj: Model) -> None: ...
-    def delete_queryset(self, request: WSGIRequest, queryset: QuerySet) -> None: ...
+    def delete_model(self, request: HttpRequest, obj: Model) -> 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 render_change_form(
@@ -204,52 +196,51 @@ class ModelAdmin(BaseModelAdmin):
         obj: Optional[Any] = ...,
     ): ...
     def response_add(
-        self, request: WSGIRequest, obj: Model, post_url_continue: Optional[str] = ...
+        self, request: HttpRequest, obj: Model, post_url_continue: Optional[str] = ...
     ) -> HttpResponse: ...
-    def response_change(self, request: WSGIRequest, obj: Model) -> HttpResponse: ...
-    def response_post_save_add(self, request: WSGIRequest, obj: Model) -> HttpResponseRedirect: ...
-    def response_post_save_change(self, request: WSGIRequest, obj: Model) -> HttpResponseRedirect: ...
-    def response_action(self, request: WSGIRequest, queryset: QuerySet) -> Optional[HttpResponseBase]: ...
-    def response_delete(self, request: WSGIRequest, obj_display: str, obj_id: int) -> 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_delete(self, request: HttpRequest, obj_display: str, obj_id: int) -> HttpResponse: ...
     def render_delete_form(self, request: Any, context: Any): ...
     def get_inline_formsets(
-        self, request: WSGIRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[Model] = ...
+        self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[Model] = ...
     ) -> List[Any]: ...
-    def get_changeform_initial_data(self, request: WSGIRequest) -> Dict[str, str]: ...
+    def get_changeform_initial_data(self, request: HttpRequest) -> Dict[str, str]: ...
     def changeform_view(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         object_id: Optional[str] = ...,
         form_url: str = ...,
         extra_context: Optional[Dict[str, bool]] = ...,
     ) -> Any: ...
-    def autocomplete_view(self, request: WSGIRequest) -> JsonResponse: ...
-    def add_view(self, request: WSGIRequest, form_url: str = ..., extra_context: None = ...) -> HttpResponse: ...
+    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: WSGIRequest, object_id: str, form_url: str = ..., extra_context: Optional[Dict[str, bool]] = ...
+        self, request: HttpRequest, object_id: str, form_url: str = ..., extra_context: Optional[Dict[str, bool]] = ...
     ) -> HttpResponse: ...
     def changelist_view(
-        self, request: WSGIRequest, extra_context: Optional[Dict[str, str]] = ...
+        self, request: HttpRequest, extra_context: Optional[Dict[str, str]] = ...
     ) -> TemplateResponse: ...
     def get_deleted_objects(
-        self, objs: QuerySet, request: WSGIRequest
+        self, objs: QuerySet, request: HttpRequest
     ) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
-    def delete_view(self, request: WSGIRequest, object_id: str, extra_context: None = ...) -> Any: ...
-    def history_view(self, request: WSGIRequest, object_id: str, extra_context: None = ...) -> HttpResponse: ...
+    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: ...
 
 class InlineModelAdmin(BaseModelAdmin):
     model: Any = ...
     fk_name: Any = ...
     formset: Any = ...
     extra: int = ...
-    min_num: Any = ...
-    max_num: Any = ...
-    template: Any = ...
-    verbose_name: Any = ...
-    verbose_name_plural: Any = ...
+    min_num: Optional[int] = ...
+    max_num: Optional[int] = ...
+    template: str = ...
+    verbose_name: Optional[str] = ...
+    verbose_name_plural: Optional[str] = ...
     can_delete: bool = ...
     show_change_link: bool = ...
-    checks_class: Any = ...
     classes: Any = ...
     admin_site: Any = ...
     parent_model: Any = ...
@@ -258,18 +249,10 @@ class InlineModelAdmin(BaseModelAdmin):
     def __init__(self, parent_model: Union[Type[Model], Model], admin_site: AdminSite) -> None: ...
     @property
     def media(self) -> Media: ...
-    def get_extra(self, request: WSGIRequest, obj: Optional[Model] = ..., **kwargs: Any) -> int: ...
-    def get_min_num(self, request: WSGIRequest, obj: Optional[Model] = ..., **kwargs: Any) -> None: ...
-    def get_max_num(self, request: WSGIRequest, obj: Optional[Model] = ..., **kwargs: Any) -> Optional[int]: ...
-    fields: Any = ...
+    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_queryset(self, request: WSGIRequest) -> QuerySet: ...
-    def has_change_permission(self, request: WSGIRequest, obj: Optional[Model] = ...) -> bool: ...
-    def has_delete_permission(self, request: WSGIRequest, obj: Optional[Model] = ...) -> bool: ...
-    def has_view_permission(self, request: WSGIRequest, obj: Optional[Model] = ...) -> bool: ...
 
-class StackedInline(InlineModelAdmin):
-    template: str = ...
-
-class TabularInline(InlineModelAdmin):
-    template: str = ...
+class StackedInline(InlineModelAdmin): ...
+class TabularInline(InlineModelAdmin): ...

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

@@ -32,7 +32,7 @@ def result_list(
     str, Union[List[Dict[str, Optional[Union[int, str]]]], List[ResultList], List[BoundField], ChangeList, int]
 ]: ...
 def result_list_tag(parser: Parser, token: Token) -> InclusionAdminNode: ...
-def date_hierarchy(cl: ChangeList) -> Optional[Dict[str, Union[Dict[str, str], List[Dict[str, str]], bool]]]: ...
+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: ...

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

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Dict, List
 
 from django.template.base import Parser, Token
 from django.template.context import Context

django-stubs/contrib/admin/tests.pyi

@@ -0,0 +1,23 @@
+from typing import Any, Callable
+
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from django.test.selenium import SeleniumTestCase
+from django.utils.deprecation import MiddlewareMixin
+
+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(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 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 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,5 +1,6 @@
+import collections
 from datetime import datetime
-from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Type, Union
 from uuid import UUID
 
 from django.contrib.admin.options import BaseModelAdmin
@@ -8,28 +9,23 @@ 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 import Field
 from django.db.models.fields.mixins import FieldCacheMixin
-from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToOneRel, OneToOneRel
+from django.db.models.fields.reverse_related import ManyToOneRel
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
+from django.forms.forms import BaseForm
 from django.utils.safestring import SafeText
 
+from django.db.models.fields import Field, reverse_related
+
 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 quote(s: Union[int, str, UUID]) -> Union[int, str, UUID]: ...
+def quote(s: Union[int, str, UUID]) -> str: ...
 def unquote(s: str) -> str: ...
-def flatten(
-    fields: Union[List[Union[Callable, str]], List[Union[List[str], str]], List[Union[Tuple[str, str], str]], Tuple]
-) -> List[Union[Callable, str]]: ...
-def flatten_fieldsets(
-    fieldsets: Union[
-        List[Tuple[Optional[str], Dict[str, Tuple[str]]]],
-        Tuple[Tuple[Optional[str], Dict[str, Tuple[Union[Tuple[str, str], str]]]]],
-    ]
-) -> List[Union[Callable, str]]: ...
+def flatten(fields: Any) -> List[Union[Callable, str]]: ...
+def flatten_fieldsets(fieldsets: Any) -> List[Union[Callable, str]]: ...
 def get_deleted_objects(
     objs: QuerySet, request: WSGIRequest, admin_site: AdminSite
 ) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
@@ -47,7 +43,7 @@ class NestedObjects(Collector):
     def add_edge(self, source: Optional[Model], target: Model) -> None: ...
     def collect(
         self,
-        objs: Union[List[Model], QuerySet],
+        objs: Union[Sequence[Optional[Model]], QuerySet],
         source: Optional[Type[Model]] = ...,
         source_attr: Optional[str] = ...,
         **kwargs: Any
@@ -62,7 +58,11 @@ def lookup_field(
     name: Union[Callable, str], obj: Model, model_admin: BaseModelAdmin = ...
 ) -> Tuple[Optional[Field], Callable, Callable]: ...
 def label_for_field(
-    name: Union[Callable, str], model: Type[Model], model_admin: Optional[BaseModelAdmin] = ..., return_attr: bool = ...
+    name: Union[Callable, str],
+    model: Type[Model],
+    model_admin: Optional[BaseModelAdmin] = ...,
+    return_attr: bool = ...,
+    form: Optional[BaseForm] = ...,
 ) -> Union[Tuple[Optional[str], Union[Callable, Type[str]]], str]: ...
 def help_text_for_field(name: str, model: Type[Model]) -> str: ...
 def display_for_field(

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

@@ -1,18 +1,10 @@
-from typing import Any, Optional
+from typing import Any
 
+from django.contrib.admin.options import ModelAdmin
 from django.core.handlers.wsgi import WSGIRequest
-from django.core.paginator import Paginator
-from django.db.models.query import QuerySet
-from django.http.response import JsonResponse
 from django.views.generic.list import BaseListView
 
 class AutocompleteJsonView(BaseListView):
-    paginate_by: int = ...
     model_admin: ModelAdmin = ...
     term: Any = ...
-    paginator_class: Any = ...
-    object_list: Any = ...
-    def get(self, request: WSGIRequest, *args: Any, **kwargs: Any) -> JsonResponse: ...
-    def get_paginator(self, *args: Any, **kwargs: Any) -> Paginator: ...
-    def get_queryset(self) -> QuerySet: ...
     def has_perm(self, request: WSGIRequest, obj: None = ...) -> bool: ...

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

@@ -2,7 +2,7 @@ from collections import OrderedDict
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.contrib.admin.filters import ListFilter, SimpleListFilter
-from django.contrib.admin.options import ModelAdmin
+from django.contrib.admin.options import ModelAdmin, IS_POPUP_VAR as IS_POPUP_VAR, TO_FIELD_VAR as TO_FIELD_VAR
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, CombinedExpression, OrderBy

django-stubs/contrib/admin/widgets.pyi

@@ -1,18 +1,12 @@
-from collections import OrderedDict
-from datetime import datetime
-from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
+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 django import forms
-from django.contrib.admin.sites import AdminSite
-from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToOneRel, ManyToManyRel
-from django.db.models.query_utils import Q
-from django.forms.fields import Field
-from django.forms.widgets import ChoiceWidget, Media, Widget, DateTimeBaseInput
-from django.http.request import QueryDict
-from django.utils.datastructures import MultiValueDict
 
 class FilteredSelectMultiple(forms.SelectMultiple):
     @property
@@ -20,111 +14,36 @@ class FilteredSelectMultiple(forms.SelectMultiple):
     verbose_name: Any = ...
     is_stacked: Any = ...
     def __init__(self, verbose_name: str, is_stacked: bool, attrs: None = ..., choices: Tuple = ...) -> None: ...
-    def get_context(
-        self, name: str, value: Union[List[Any], str], attrs: Optional[Dict[str, str]]
-    ) -> Dict[
-        str,
-        Union[
-            Dict[
-                str,
-                Union[
-                    Dict[str, Union[int, str]],
-                    List[Tuple[None, List[Dict[str, Union[Dict[Any, Any], int, str]]], int]],
-                    bool,
-                    str,
-                ],
-            ],
-            Dict[str, Union[Dict[str, Union[int, str]], List[str], bool, str]],
-        ],
-    ]: ...
 
 class AdminDateWidget(forms.DateInput):
-    attrs: Dict[str, str]
-    input_type: str
     @property
     def media(self) -> Media: ...
-    def __init__(self, attrs: Optional[Dict[str, Union[int, str]]] = ..., format: None = ...) -> None: ...
 
 class AdminTimeWidget(forms.TimeInput):
-    attrs: Dict[str, str]
-    input_type: str
     @property
     def media(self) -> Media: ...
-    def __init__(self, attrs: Optional[Dict[str, Union[int, str]]] = ..., format: None = ...) -> None: ...
 
-class AdminSplitDateTime(forms.SplitDateTimeWidget):
-    attrs: Dict[Any, Any]
-    widgets: List[DateTimeBaseInput]
-    template_name: str = ...
-    def __init__(self, attrs: None = ...) -> None: ...
-    def get_context(
-        self, name: str, value: Optional[Union[List[str], datetime]], attrs: Optional[Dict[str, Union[bool, str]]]
-    ) -> Dict[
-        str,
-        Union[
-            Dict[
-                str,
-                Optional[
-                    Union[
-                        Dict[str, Union[bool, str]],
-                        List[Dict[str, Optional[Union[Dict[str, Union[bool, str]], bool, str]]]],
-                        bool,
-                        str,
-                    ]
-                ],
-            ],
-            str,
-        ],
-    ]: ...
+class AdminSplitDateTime(forms.SplitDateTimeWidget): ...
+class AdminRadioSelect(forms.RadioSelect): ...
+class AdminFileWidget(forms.ClearableFileInput): ...
 
-class AdminRadioSelect(forms.RadioSelect):
-    attrs: Dict[str, str]
-    template_name: str = ...
-
-class AdminFileWidget(forms.ClearableFileInput):
-    attrs: Dict[Any, Any]
-    template_name: str = ...
-
-def url_params_from_lookup_dict(
-    lookups: Union[
-        Dict[str, Callable], Dict[str, List[str]], Dict[str, Tuple[str, str]], Dict[str, bool], Dict[str, str], Q
-    ]
-) -> Dict[str, str]: ...
+def url_params_from_lookup_dict(lookups: Any) -> Dict[str, str]: ...
 
 class ForeignKeyRawIdWidget(forms.TextInput):
-    attrs: Dict[Any, Any]
-    template_name: str = ...
     rel: ManyToOneRel = ...
     admin_site: AdminSite = ...
     db: None = ...
     def __init__(self, rel: ForeignObjectRel, admin_site: AdminSite, attrs: None = ..., using: None = ...) -> None: ...
-    def get_context(
-        self, name: str, value: Optional[Union[List[int], int, str, UUID]], attrs: Optional[Dict[str, Union[bool, str]]]
-    ) -> Dict[str, Union[Dict[str, Optional[Union[Dict[str, Union[bool, str]], bool, str]]], str]]: ...
     def base_url_parameters(self) -> Dict[str, str]: ...
     def url_parameters(self) -> Dict[str, str]: ...
     def label_and_url_for_value(self, value: Union[int, str, UUID]) -> Tuple[str, str]: ...
 
-class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
-    admin_site: AdminSite
-    attrs: Dict[Any, Any]
-    db: None
-    rel: ManyToManyRel
-    template_name: str = ...
-    def get_context(
-        self, name: str, value: Optional[List[int]], attrs: Optional[Dict[str, str]]
-    ) -> Dict[str, Union[Dict[str, Union[Dict[str, str], bool, str]], str]]: ...
-    def url_parameters(self) -> Dict[Any, Any]: ...
-    def label_and_url_for_value(self, value: List[int]) -> Tuple[str, str]: ...
-    def value_from_datadict(self, data: QueryDict, files: MultiValueDict, name: str) -> None: ...
-    def format_value(self, value: Optional[List[int]]) -> str: ...
+class ManyToManyRawIdWidget(ForeignKeyRawIdWidget): ...
 
 class RelatedFieldWidgetWrapper(forms.Widget):
     template_name: str = ...
-    needs_multipart_form: bool = ...
-    attrs: Dict[Any, Any] = ...
     choices: ModelChoiceIterator = ...
-    widget: AutocompleteSelect = ...
+    widget: forms.Widget = ...
     rel: ManyToOneRel = ...
     can_add_related: bool = ...
     can_change_related: bool = ...
@@ -133,7 +52,7 @@ class RelatedFieldWidgetWrapper(forms.Widget):
     admin_site: AdminSite = ...
     def __init__(
         self,
-        widget: ChoiceWidget,
+        widget: forms.Widget,
         rel: ForeignObjectRel,
         admin_site: AdminSite,
         can_add_related: Optional[bool] = ...,
@@ -141,54 +60,22 @@ class RelatedFieldWidgetWrapper(forms.Widget):
         can_delete_related: bool = ...,
         can_view_related: bool = ...,
     ) -> None: ...
-    def __deepcopy__(
-        self, memo: Dict[int, Union[List[Union[Field, Widget]], OrderedDict, Field, Widget]]
-    ) -> RelatedFieldWidgetWrapper: ...
-    @property
-    def is_hidden(self) -> bool: ...
     @property
     def media(self) -> Media: ...
     def get_related_url(self, info: Tuple[str, str], action: str, *args: Any) -> str: ...
-    def get_context(
-        self, name: str, value: Optional[Union[int, str]], attrs: Optional[Dict[str, Union[bool, str]]]
-    ) -> Dict[str, Union[bool, str]]: ...
-    def value_from_datadict(
-        self, data: QueryDict, files: MultiValueDict, name: str
-    ) -> Optional[Union[List[str], str]]: ...
-    def value_omitted_from_data(self, data: Dict[Any, Any], files: Dict[Any, Any], name: str) -> bool: ...
-    def id_for_label(self, id_: str) -> str: ...
 
-class AdminTextareaWidget(forms.Textarea):
-    attrs: Dict[str, str]
-    def __init__(self, attrs: None = ...) -> None: ...
-
-class AdminTextInputWidget(forms.TextInput):
-    attrs: Dict[str, str]
-    input_type: str
-    def __init__(self, attrs: None = ...) -> None: ...
-
-class AdminEmailInputWidget(forms.EmailInput):
-    attrs: Dict[str, str]
-    input_type: str
-    def __init__(self, attrs: None = ...) -> None: ...
-
-class AdminURLFieldWidget(forms.URLInput):
-    attrs: Dict[str, str]
-    input_type: str
-    template_name: str = ...
-    def __init__(self, attrs: None = ...) -> None: ...
-    def get_context(
-        self, name: str, value: Optional[str], attrs: Optional[Dict[str, str]]
-    ) -> Dict[str, Union[Dict[str, Optional[Union[Dict[str, str], bool, str]]], str]]: ...
+class AdminTextareaWidget(forms.Textarea): ...
+class AdminTextInputWidget(forms.TextInput): ...
+class AdminEmailInputWidget(forms.EmailInput): ...
+class AdminURLFieldWidget(forms.URLInput): ...
 
 class AdminIntegerFieldWidget(forms.NumberInput):
-    attrs: Dict[str, str]
-    input_type: str
     class_name: str = ...
-    def __init__(self, attrs: None = ...) -> None: ...
 
-class AdminBigIntegerFieldWidget(AdminIntegerFieldWidget):
-    class_name: str = ...
+class AdminBigIntegerFieldWidget(AdminIntegerFieldWidget): ...
+
+class AdminUUIDInputWidget(forms.TextInput):
+    def __init__(self, attrs: Optional[Dict[str, str]] = ...) -> None: ...
 
 SELECT2_TRANSLATIONS: Any
 
@@ -208,12 +95,6 @@ class AutocompleteMixin:
         using: None = ...,
     ) -> None: ...
     def get_url(self) -> str: ...
-    def build_attrs(
-        self, base_attrs: Dict[str, str], extra_attrs: Optional[Dict[str, Union[bool, str]]] = ...
-    ) -> Dict[str, Union[bool, str]]: ...
-    def optgroups(
-        self, name: str, value: List[str], attr: Dict[str, Union[bool, str]] = ...
-    ) -> List[Tuple[None, List[Dict[str, Union[Dict[str, bool], Set[str], int, str]]], int]]: ...
     @property
     def media(self) -> Media: ...
 

django-stubs/contrib/auth/admin.pyi

@@ -1,54 +1,18 @@
-from typing import Any, Dict, List, Optional, Tuple, Type
+from typing import Any
 
-from django.contrib.auth.models import User, Group
 from django.core.handlers.wsgi import WSGIRequest
-from django.db.models.fields.related import ManyToManyField
-from django.forms.models import ModelMultipleChoiceField
 from django.http.response import HttpResponse
-from django.urls.resolvers import URLPattern
 
 from django.contrib import admin
-from django.contrib.admin.sites import AdminSite
 
 csrf_protect_m: Any
 sensitive_post_parameters_m: Any
 
-class GroupAdmin(admin.ModelAdmin):
-    admin_site: AdminSite
-    formfield_overrides: Any
-    model: Type[Group]
-    opts: Options
-    search_fields: Any = ...
-    ordering: Any = ...
-    filter_horizontal: Any = ...
-    def formfield_for_manytomany(
-        self, db_field: ManyToManyField, request: WSGIRequest = ..., **kwargs: Any
-    ) -> ModelMultipleChoiceField: ...
+class GroupAdmin(admin.ModelAdmin): ...
 
 class UserAdmin(admin.ModelAdmin):
-    admin_site: AdminSite
-    formfield_overrides: Dict[
-        Type[Union[django.db.models.fields.DateTimeCheckMixin, Field]],
-        Dict[str, Type[Union[django.forms.fields.SplitDateTimeField, Widget]]],
-    ]
-    model: Type[User]
-    opts: Options
-    add_form_template: str = ...
     change_user_password_template: Any = ...
-    fieldsets: Any = ...
     add_fieldsets: Any = ...
-    form: Any = ...
     add_form: Any = ...
     change_password_form: Any = ...
-    list_display: Any = ...
-    list_filter: Any = ...
-    search_fields: Any = ...
-    ordering: Any = ...
-    filter_horizontal: Any = ...
-    def get_fieldsets(self, request: WSGIRequest, obj: None = ...) -> Tuple[Tuple[None, Dict[str, Tuple[str]]]]: ...
-    def get_form(self, request: Any, obj: Optional[Any] = ..., **kwargs: Any): ...
-    def get_urls(self) -> List[URLPattern]: ...
-    def lookup_allowed(self, lookup: str, value: str) -> bool: ...
-    def add_view(self, request: WSGIRequest, form_url: str = ..., extra_context: None = ...) -> Any: ...
     def user_change_password(self, request: WSGIRequest, id: str, form_url: str = ...) -> HttpResponse: ...
-    def response_add(self, request: WSGIRequest, obj: User, post_url_continue: None = ...) -> HttpResponse: ...

django-stubs/contrib/auth/apps.pyi

@@ -1,18 +1,3 @@
-from typing import Any, Optional
-
 from django.apps import AppConfig
 
-from .checks import check_models_permissions, check_user_model
-from .management import create_permissions
-from .signals import user_logged_in
-
-class AuthConfig(AppConfig):
-    apps: None
-    label: str
-    models: None
-    models_module: None
-    module: Any
-    path: str
-    name: str = ...
-    verbose_name: Any = ...
-    def ready(self) -> None: ...
+class AuthConfig(AppConfig): ...

django-stubs/contrib/auth/base_user.pyi

@@ -1,18 +1,23 @@
-from typing import Any, Optional, Tuple, List
+from typing import Any, Optional, Tuple, List, overload, TypeVar
+
+from django.db.models.base import Model
 
 from django.db import models
 
-class BaseUserManager(models.Manager):
+_T = TypeVar("_T", bound=Model)
+
+class BaseUserManager(models.Manager[_T]):
     @classmethod
     def normalize_email(cls, email: Optional[str]) -> str: ...
     def make_random_password(self, length: int = ..., allowed_chars: str = ...) -> str: ...
-    def get_by_natural_key(self, username: Optional[str]) -> AbstractBaseUser: ...
+    def get_by_natural_key(self, username: Optional[str]) -> _T: ...
 
 class AbstractBaseUser(models.Model):
     password: models.CharField = ...
-    last_login: Optional[models.DateTimeField] = ...
+    last_login: models.DateTimeField = ...
     is_active: models.BooleanField = ...
     REQUIRED_FIELDS: List[str] = ...
+    class Meta: ...
     def get_username(self) -> str: ...
     def clean(self) -> None: ...
     def save(self, *args: Any, **kwargs: Any) -> None: ...
@@ -29,4 +34,8 @@ class AbstractBaseUser(models.Model):
     @classmethod
     def get_email_field_name(cls) -> str: ...
     @classmethod
+    @overload
     def normalize_username(cls, username: str) -> str: ...
+    @classmethod
+    @overload
+    def normalize_username(cls, username: Any) -> Any: ...

django-stubs/contrib/auth/checks.pyi

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

django-stubs/contrib/auth/context_processors.pyi

@@ -1,22 +1,20 @@
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict
 
-from django.contrib.auth.models import AnonymousUser, User
 from django.http.request import HttpRequest
-from django.utils.functional import SimpleLazyObject
 
 class PermLookupDict:
-    app_label: django.utils.safestring.SafeText
-    user: SimpleLazyObject
-    def __init__(self, user: SimpleLazyObject, app_label: str) -> None: ...
+    app_label: str
+    user: Any
+    def __init__(self, user: Any, app_label: str) -> None: ...
     def __getitem__(self, perm_name: str) -> bool: ...
     def __iter__(self) -> Any: ...
     def __bool__(self) -> bool: ...
 
 class PermWrapper:
-    user: SimpleLazyObject = ...
-    def __init__(self, user: Union[AnonymousUser, User]) -> None: ...
+    user: Any = ...
+    def __init__(self, user: Any) -> None: ...
     def __getitem__(self, app_label: str) -> PermLookupDict: ...
     def __iter__(self) -> Any: ...
-    def __contains__(self, perm_name: Union[bool, str]) -> bool: ...
+    def __contains__(self, perm_name: Any) -> bool: ...
 
-def auth(request: HttpRequest) -> Dict[str, Union[PermWrapper, AnonymousUser, User]]: ...
+def auth(request: HttpRequest) -> Dict[str, Any]: ...

django-stubs/contrib/auth/decorators.pyi

@@ -1,5 +1,7 @@
 from typing import Any, Callable, List, Optional, Set, Union
 
+from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME
+
 def user_passes_test(
     test_func: Callable, login_url: Optional[str] = ..., redirect_field_name: str = ...
 ) -> Callable: ...

django-stubs/contrib/auth/forms.pyi

@@ -1,84 +1,36 @@
-import collections
-import datetime
-from typing import Any, Dict, Iterator, List, Optional, Union, Type
+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 django.forms.utils import ErrorList
-from django.http.request import QueryDict
-from django.utils.datastructures import MultiValueDict
 
 from django import forms
 
 UserModel: Any
 
 class ReadOnlyPasswordHashWidget(forms.Widget):
-    attrs: Dict[Any, Any]
     template_name: str = ...
 
 class ReadOnlyPasswordHashField(forms.Field):
-    widget: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    def bound_data(self, data: None, initial: str) -> str: ...
-    def has_changed(self, initial: str, data: Optional[str]) -> bool: ...
 
-class UsernameField(forms.CharField):
-    def to_python(self, value: Optional[str]) -> str: ...
+class UsernameField(forms.CharField): ...
 
 class UserCreationForm(forms.ModelForm):
-    auto_id: str
-    data: Dict[str, str]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    instance: User
-    is_bound: bool
-    label_suffix: str
     error_messages: Any = ...
     password1: Any = ...
     password2: Any = ...
-    class Meta:
-        model: Any = ...
-        fields: Any = ...
-        field_classes: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def clean_password2(self) -> str: ...
-    def save(self, commit: bool = ...) -> User: ...
 
 class UserChangeForm(forms.ModelForm):
-    auto_id: str
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[str, Optional[Union[List[Any], datetime.datetime, int, str]]]
-    instance: User
-    is_bound: bool
-    label_suffix: str
     password: Any = ...
-    class Meta:
-        model: Any = ...
-        fields: str = ...
-        field_classes: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def clean_password(self) -> str: ...
 
 class AuthenticationForm(forms.Form):
-    auto_id: str
-    data: QueryDict
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: MultiValueDict
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
     username: Any = ...
     password: Any = ...
     error_messages: Any = ...
@@ -91,21 +43,12 @@ class AuthenticationForm(forms.Form):
     def get_invalid_login_error(self) -> ValidationError: ...
 
 class PasswordResetForm(forms.Form):
-    auto_id: str
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
     email: Any = ...
     def send_mail(
         self,
         subject_template_name: str,
         email_template_name: str,
-        context: Dict[str, Union[AbstractBaseUser, str]],
+        context: Dict[str, Any],
         from_email: Optional[str],
         to_email: str,
         html_email_template_name: Optional[str] = ...,
@@ -125,15 +68,6 @@ class PasswordResetForm(forms.Form):
     ) -> None: ...
 
 class SetPasswordForm(forms.Form):
-    auto_id: str
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
     error_messages: Any = ...
     new_password1: Any = ...
     new_password2: Any = ...
@@ -143,31 +77,10 @@ class SetPasswordForm(forms.Form):
     def save(self, commit: bool = ...) -> AbstractBaseUser: ...
 
 class PasswordChangeForm(SetPasswordForm):
-    auto_id: str
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
-    user: User
-    error_messages: Any = ...
     old_password: Any = ...
-    field_order: Any = ...
     def clean_old_password(self) -> str: ...
 
 class AdminPasswordChangeForm(forms.Form):
-    auto_id: str
-    data: Dict[Any, Any]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[Any, Any]
-    is_bound: bool
-    label_suffix: str
     error_messages: Any = ...
     required_css_class: str = ...
     password1: Any = ...
@@ -176,5 +89,3 @@ class AdminPasswordChangeForm(forms.Form):
     def __init__(self, user: AbstractUser, *args: Any, **kwargs: Any) -> None: ...
     def clean_password2(self) -> str: ...
     def save(self, commit: bool = ...) -> AbstractUser: ...
-    @property
-    def changed_data(self) -> List[str]: ...

django-stubs/contrib/auth/hashers.pyi

@@ -23,7 +23,7 @@ class BasePasswordHasher:
     memory_cost: int = ...
     parallelism: int = ...
     digest: Any = ...
-    iterations: Optional[int] = ...
+    iterations: int = ...
     def salt(self) -> str: ...
     def verify(self, password: str, encoded: str) -> bool: ...
     def encode(self, password: str, salt: str) -> Any: ...

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

@@ -1,4 +1,9 @@
+import getpass as getpass
+from typing import Any
+
 from django.core.management.base import BaseCommand
 
 class NotRunningInTTYException(Exception): ...
-class Command(BaseCommand): ...
+
+class Command(BaseCommand):
+    stdin: Any

django-stubs/contrib/auth/middleware.pyi

@@ -13,8 +13,8 @@ class AuthenticationMiddleware(MiddlewareMixin):
 class RemoteUserMiddleware(MiddlewareMixin):
     header: str = ...
     force_logout_if_no_header: bool = ...
-    def process_request(self, request: WSGIRequest) -> None: ...
-    def clean_username(self, username: str, request: WSGIRequest) -> str: ...
+    def process_request(self, request: HttpRequest) -> None: ...
+    def clean_username(self, username: str, request: HttpRequest) -> str: ...
 
 class PersistentRemoteUserMiddleware(RemoteUserMiddleware):
     force_logout_if_no_header: bool = ...

django-stubs/contrib/auth/mixins.pyi

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

django-stubs/contrib/auth/models.pyi

@@ -1,7 +1,9 @@
-import datetime
-from typing import Any, List, Optional, Set, Tuple, Type, Union
+from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar
 
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager
+from django.contrib.auth.validators import UnicodeUsernameValidator
+from django.contrib.contenttypes.models import ContentType
+from django.db.models.base import Model
 from django.db.models.manager import EmptyManager
 
 from django.db import models
@@ -9,64 +11,51 @@ from django.db import models
 def update_last_login(sender: Type[AbstractBaseUser], user: AbstractBaseUser, **kwargs: Any) -> None: ...
 
 class PermissionManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def get_by_natural_key(self, codename: str, app_label: str, model: str) -> Permission: ...
 
 class Permission(models.Model):
     content_type_id: int
-    id: int
-    name: str = ...
-    content_type: Any = ...
-    codename: str = ...
+    name: models.CharField = ...
+    content_type: models.ForeignKey = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    codename: models.CharField = ...
     def natural_key(self) -> Tuple[str, str, str]: ...
 
 class GroupManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
-    id: None
-    name: str = ...
-    permissions: Any = ...
+    name: models.CharField = ...
+    permissions: models.ManyToManyField = models.ManyToManyField(Permission)
     def natural_key(self): ...
 
-class UserManager(BaseUserManager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
+_T = TypeVar("_T", bound=Model)
+
+class UserManager(BaseUserManager[_T]):
     def create_user(
         self, username: str, email: Optional[str] = ..., password: Optional[str] = ..., **extra_fields: Any
-    ) -> AbstractUser: ...
+    ) -> _T: ...
     def create_superuser(
         self, username: str, email: Optional[str], password: Optional[str], **extra_fields: Any
-    ) -> AbstractBaseUser: ...
+    ) -> _T: ...
 
 class PermissionsMixin(models.Model):
-    is_superuser: Any = ...
-    groups: Any = ...
-    user_permissions: Any = ...
+    is_superuser: models.BooleanField = ...
+    groups: models.ManyToManyField = models.ManyToManyField(Group)
+    user_permissions: models.ManyToManyField = models.ManyToManyField(Permission)
     def get_group_permissions(self, obj: None = ...) -> Set[str]: ...
     def get_all_permissions(self, obj: Optional[str] = ...) -> Set[str]: ...
-    def has_perm(self, perm: Union[Tuple[str, Any], str], obj: Optional[str] = ...) -> bool: ...
-    def has_perms(self, perm_list: Union[List[str], Set[str], Tuple[str]], obj: None = ...) -> bool: ...
+    def has_perm(self, perm: str, obj: Optional[str] = ...) -> bool: ...
+    def has_perms(self, perm_list: Collection[str], obj: None = ...) -> bool: ...
     def has_module_perms(self, app_label: str) -> bool: ...
 
-class AbstractUser(AbstractBaseUser, PermissionsMixin):
-    is_superuser: bool
-    username_validator: Any = ...
-    username: str = ...
-    first_name: str = ...
-    last_name: str = ...
-    email: str = ...
-    is_staff: bool = ...
-    date_joined: datetime.datetime = ...
+class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
+    username_validator: UnicodeUsernameValidator = ...
+    username: models.CharField = ...
+    first_name: models.CharField = ...
+    last_name: models.CharField = ...
+    email: models.EmailField = ...
+    is_staff: models.BooleanField = ...
+    date_joined: models.DateTimeField = ...
     EMAIL_FIELD: str = ...
     USERNAME_FIELD: str = ...
     def clean(self) -> None: ...
@@ -94,7 +83,7 @@ class AnonymousUser:
     def get_group_permissions(self, obj: None = ...) -> Set[Any]: ...
     def get_all_permissions(self, obj: Any = ...) -> Set[str]: ...
     def has_perm(self, perm: str, obj: None = ...) -> bool: ...
-    def has_perms(self, perm_list: Union[List[str], Tuple[str]], obj: None = ...) -> bool: ...
+    def has_perms(self, perm_list: Collection[str], obj: None = ...) -> bool: ...
     def has_module_perms(self, module: str) -> bool: ...
     @property
     def is_anonymous(self) -> bool: ...

django-stubs/contrib/auth/password_validation.pyi

@@ -1,48 +1,47 @@
-from pathlib import PosixPath
-from typing import Any, Dict, List, Optional, Tuple, Union
+from pathlib import Path, PosixPath
+from typing import Any, List, Mapping, Optional, Protocol, Sequence, Set, Union
 
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import User
+from django.db.models.base import Model
 
-def get_default_password_validators() -> Union[
-    List[NumericPasswordValidator], List[UserAttributeSimilarityValidator]
-]: ...
-def get_password_validators(
-    validator_config: List[Dict[str, Union[Dict[str, int], str]]]
-) -> Union[List[NumericPasswordValidator], List[UserAttributeSimilarityValidator]]: ...
+_UserModel = Model
+
+class PasswordValidator(Protocol):
+    def password_changed(self, password: str, user: Optional[_UserModel] = ...): ...
+
+def get_default_password_validators() -> List[PasswordValidator]: ...
+def get_password_validators(validator_config: Sequence[Mapping[str, Any]]) -> List[PasswordValidator]: ...
 def validate_password(
-    password: str, user: Optional[AbstractBaseUser] = ..., password_validators: Optional[List[Any]] = ...
+    password: str, user: Optional[_UserModel] = ..., password_validators: Optional[Sequence[PasswordValidator]] = ...
 ) -> None: ...
 def password_changed(
-    password: str, user: Optional[AbstractBaseUser] = ..., password_validators: None = ...
+    password: str, user: Optional[_UserModel] = ..., password_validators: Optional[Sequence[PasswordValidator]] = ...
 ) -> None: ...
-def password_validators_help_texts(password_validators: Optional[List[Any]] = ...) -> List[str]: ...
+def password_validators_help_texts(password_validators: Optional[Sequence[PasswordValidator]] = ...) -> List[str]: ...
 
 password_validators_help_text_html: Any
 
 class MinimumLengthValidator:
     min_length: int = ...
     def __init__(self, min_length: int = ...) -> None: ...
-    def validate(self, password: str, user: Optional[User] = ...) -> None: ...
+    def validate(self, password: str, user: Optional[_UserModel] = ...) -> None: ...
     def get_help_text(self) -> str: ...
 
 class UserAttributeSimilarityValidator:
-    DEFAULT_USER_ATTRIBUTES: Any = ...
-    user_attributes: Tuple[str, str, str, str] = ...
+    DEFAULT_USER_ATTRIBUTES: Sequence[str] = ...
+    user_attributes: Sequence[str] = ...
     max_similarity: float = ...
-    def __init__(
-        self, user_attributes: Union[List[str], Tuple[str, str, str, str]] = ..., max_similarity: float = ...
-    ) -> None: ...
-    def validate(self, password: str, user: Optional[User] = ...) -> None: ...
+    def __init__(self, user_attributes: Sequence[str] = ..., max_similarity: float = ...) -> None: ...
+    def validate(self, password: str, user: Optional[_UserModel] = ...) -> None: ...
     def get_help_text(self) -> str: ...
 
 class CommonPasswordValidator:
-    DEFAULT_PASSWORD_LIST_PATH: Any = ...
+    DEFAULT_PASSWORD_LIST_PATH: Path = ...
     passwords: Set[str] = ...
     def __init__(self, password_list_path: Union[PosixPath, str] = ...) -> None: ...
-    def validate(self, password: str, user: None = ...) -> None: ...
+    def validate(self, password: str, user: Optional[_UserModel] = ...) -> None: ...
     def get_help_text(self) -> str: ...
 
 class NumericPasswordValidator:
-    def validate(self, password: str, user: Optional[AbstractBaseUser] = ...) -> None: ...
+    def validate(self, password: str, user: Optional[_UserModel] = ...) -> None: ...
     def get_help_text(self) -> str: ...

django-stubs/contrib/auth/urls.pyi

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

django-stubs/contrib/auth/validators.pyi

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

django-stubs/contrib/auth/views.pyi

@@ -1,15 +1,10 @@
-from typing import Any, Dict, Optional, Set, Type, Union
+from typing import Any, Optional, Set
 
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm, PasswordResetForm, SetPasswordForm
-from django.contrib.auth.models import User
-from django.contrib.sites.models import Site
-from django.contrib.sites.requests import RequestSite
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponseRedirect
 from django.template.response import TemplateResponse
-from django.utils.datastructures import MultiValueDict
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormView
 
@@ -20,31 +15,18 @@ class SuccessURLAllowedHostsMixin:
     def get_success_url_allowed_hosts(self) -> Set[str]: ...
 
 class LoginView(SuccessURLAllowedHostsMixin, FormView):
-    form_class: Any = ...
     authentication_form: Any = ...
     redirect_field_name: Any = ...
-    template_name: str = ...
     redirect_authenticated_user: bool = ...
     extra_context: Any = ...
-    def dispatch(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
-    def get_success_url(self) -> str: ...
     def get_redirect_url(self) -> str: ...
-    def get_form_class(self) -> Type[AuthenticationForm]: ...
-    def get_form_kwargs(self) -> Dict[str, Optional[Union[Dict[str, str], HttpRequest, MultiValueDict]]]: ...
-    def form_valid(self, form: AuthenticationForm) -> HttpResponseRedirect: ...
-    def get_context_data(
-        self, **kwargs: Any
-    ) -> Dict[str, Union[AuthenticationForm, LoginView, Site, RequestSite, str]]: ...
 
 class LogoutView(SuccessURLAllowedHostsMixin, TemplateView):
     next_page: Any = ...
     redirect_field_name: Any = ...
-    template_name: str = ...
     extra_context: Any = ...
-    def dispatch(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
     def post(self, request: WSGIRequest, *args: Any, **kwargs: Any) -> TemplateResponse: ...
     def get_next_page(self) -> Optional[str]: ...
-    def get_context_data(self, **kwargs: Any): ...
 
 def logout_then_login(request: HttpRequest, login_url: Optional[str] = ...) -> HttpResponseRedirect: ...
 def redirect_to_login(
@@ -58,55 +40,32 @@ class PasswordContextMixin:
 class PasswordResetView(PasswordContextMixin, FormView):
     email_template_name: str = ...
     extra_email_context: Any = ...
-    form_class: Any = ...
     from_email: Any = ...
     html_email_template_name: Any = ...
     subject_template_name: str = ...
-    success_url: Any = ...
-    template_name: str = ...
     title: Any = ...
     token_generator: Any = ...
-    def dispatch(self, *args: Any, **kwargs: Any) -> HttpResponse: ...
-    def form_valid(self, form: PasswordResetForm) -> HttpResponseRedirect: ...
 
 INTERNAL_RESET_URL_TOKEN: str
 INTERNAL_RESET_SESSION_TOKEN: str
 
 class PasswordResetDoneView(PasswordContextMixin, TemplateView):
-    template_name: str = ...
     title: Any = ...
 
 class PasswordResetConfirmView(PasswordContextMixin, FormView):
-    form_class: Any = ...
     post_reset_login: bool = ...
     post_reset_login_backend: Any = ...
-    success_url: Any = ...
-    template_name: str = ...
     title: Any = ...
     token_generator: Any = ...
     validlink: bool = ...
     user: Any = ...
-    def dispatch(self, *args: Any, **kwargs: Any) -> HttpResponse: ...
     def get_user(self, uidb64: str) -> Optional[AbstractBaseUser]: ...
-    def get_form_kwargs(self) -> Dict[str, Optional[Union[Dict[Any, Any], AbstractBaseUser, MultiValueDict]]]: ...
-    def form_valid(self, form: SetPasswordForm) -> HttpResponseRedirect: ...
-    def get_context_data(self, **kwargs: Any): ...
 
 class PasswordResetCompleteView(PasswordContextMixin, TemplateView):
-    template_name: str = ...
     title: Any = ...
-    def get_context_data(self, **kwargs: Any): ...
 
 class PasswordChangeView(PasswordContextMixin, FormView):
-    form_class: Any = ...
-    success_url: Any = ...
-    template_name: str = ...
     title: Any = ...
-    def dispatch(self, *args: Any, **kwargs: Any) -> HttpResponse: ...
-    def get_form_kwargs(self) -> Dict[str, Optional[Union[Dict[Any, Any], User, MultiValueDict]]]: ...
-    def form_valid(self, form: PasswordChangeForm) -> HttpResponseRedirect: ...
 
 class PasswordChangeDoneView(PasswordContextMixin, TemplateView):
-    template_name: str = ...
     title: Any = ...
-    def dispatch(self, *args: Any, **kwargs: Any) -> TemplateResponse: ...

django-stubs/contrib/contenttypes/apps.pyi

@@ -1,16 +1,3 @@
-from typing import Any, Optional
-
 from django.apps import AppConfig
 
-from .management import create_contenttypes, inject_rename_contenttypes_operations
-
-class ContentTypesConfig(AppConfig):
-    apps: None
-    label: str
-    models: None
-    models_module: None
-    module: Any
-    path: str
-    name: str = ...
-    verbose_name: Any = ...
-    def ready(self) -> None: ...
+class ContentTypesConfig(AppConfig): ...

django-stubs/contrib/contenttypes/fields.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union, Generic
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.checks.messages import Error
@@ -7,6 +7,7 @@ from django.db.models.fields.related import ForeignObject
 from django.db.models.fields.related_descriptors import ReverseManyToOneDescriptor
 from django.db.models.fields.reverse_related import ForeignObjectRel
 
+from django.db.models.expressions import Combinable
 from django.db.models.fields import Field, PositiveIntegerField
 from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.query import QuerySet
@@ -14,6 +15,10 @@ from django.db.models.query_utils import FilteredRelation, PathInfo
 from django.db.models.sql.where import WhereNode
 
 class GenericForeignKey(FieldCacheMixin):
+    # django-stubs implementation only fields
+    _pyi_private_set_type: Union[Any, Combinable]
+    _pyi_private_get_type: Any
+    # attributes
     auto_created: bool = ...
     concrete: bool = ...
     editable: bool = ...
@@ -44,36 +49,21 @@ 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[Union[GenericForeignKey, Model]]: ...
-    def __set__(self, instance: Model, value: Optional[Model]) -> None: ...
+    def __get__(self, instance: Optional[Model], cls: Type[Model] = ...) -> Optional[Any]: ...
+    def __set__(self, instance: Model, value: Optional[Any]) -> None: ...
 
 class GenericRel(ForeignObjectRel):
     field: GenericRelation
-    limit_choices_to: Dict[Any, Any]
-    model: Type[Model]
-    multiple: bool
-    on_delete: Callable
-    parent_link: bool
-    related_name: str
-    related_query_name: None
-    symmetrical: bool
     def __init__(
         self,
         field: GenericRelation,
         to: Union[Type[Model], str],
-        related_name: None = ...,
+        related_name: Optional[str] = ...,
         related_query_name: Optional[str] = ...,
-        limit_choices_to: None = ...,
+        limit_choices_to: Optional[Union[Dict[str, Any], Callable[[], Any]]] = ...,
     ) -> None: ...
 
 class GenericRelation(ForeignObject):
-    auto_created: bool = ...
-    many_to_many: bool = ...
-    many_to_one: bool = ...
-    one_to_many: bool = ...
-    one_to_one: bool = ...
     rel_class: Any = ...
     mti_inherited: bool = ...
     object_id_field_name: Any = ...
@@ -87,26 +77,19 @@ class GenericRelation(ForeignObject):
         content_type_field: str = ...,
         for_concrete_model: bool = ...,
         related_query_name: Optional[str] = ...,
-        limit_choices_to: None = ...,
+        limit_choices_to: Optional[Union[Dict[str, Any], Callable[[], Any]]] = ...,
         **kwargs: Any
     ) -> None: ...
-    def check(self, **kwargs: Any) -> List[Error]: ...
     def resolve_related_fields(self) -> List[Tuple[PositiveIntegerField, 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: ...
-    model: Any = ...
-    def set_attributes_from_rel(self) -> None: ...
-    def get_internal_type(self) -> str: ...
     def get_content_type(self) -> ContentType: ...
     def get_extra_restriction(
         self, where_class: Type[WhereNode], alias: Optional[str], remote_alias: str
     ) -> WhereNode: ...
     def bulk_related_objects(self, objs: List[Model], using: str = ...) -> QuerySet: ...
 
-class ReverseGenericManyToOneDescriptor(ReverseManyToOneDescriptor):
-    field: GenericRelation
-    rel: GenericRel
-    def related_manager_cls(self): ...
+class ReverseGenericManyToOneDescriptor(ReverseManyToOneDescriptor): ...
 
 def create_generic_related_manager(superclass: Any, rel: Any): ...

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

@@ -1,20 +1,13 @@
-from typing import Any, Optional
+from typing import Any, Dict, List
 
-from django.core.management import BaseCommand
-from django.core.management.base import CommandParser
 from django.db.models.deletion import Collector
 
-from ...management import get_contenttypes_and_models
+from django.core.management import BaseCommand
 
-class Command(BaseCommand):
-    stderr: django.core.management.base.OutputWrapper
-    stdout: django.core.management.base.OutputWrapper
-    style: django.core.management.color.Style
-    def add_arguments(self, parser: CommandParser) -> None: ...
-    def handle(self, **options: Any) -> None: ...
+class Command(BaseCommand): ...
 
 class NoFastDeleteCollector(Collector):
-    data: collections.OrderedDict
+    data: Dict[str, Any]
     dependencies: Dict[Any, Any]
     fast_deletes: List[Any]
     field_updates: Dict[Any, Any]

django-stubs/contrib/contenttypes/models.pyi

@@ -4,12 +4,7 @@ from django.db import models
 from django.db.models.base import Model
 from django.db.models.query import QuerySet
 
-class ContentTypeManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
-    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+class ContentTypeManager(models.Manager["ContentType"]):
     def get_by_natural_key(self, app_label: str, model: str) -> ContentType: ...
     def get_for_model(self, model: Union[Type[Model], Model], for_concrete_model: bool = ...) -> ContentType: ...
     def get_for_models(self, *models: Any, for_concrete_models: bool = ...) -> Dict[Type[Model], ContentType]: ...
@@ -18,14 +13,9 @@ class ContentTypeManager(models.Manager):
 
 class ContentType(models.Model):
     id: int
-    app_label: str = ...
-    model: str = ...
-    objects: Any = ...
-    class Meta:
-        verbose_name: Any = ...
-        verbose_name_plural: Any = ...
-        db_table: str = ...
-        unique_together: Any = ...
+    app_label: models.CharField = ...
+    model: models.CharField = ...
+    objects: ContentTypeManager = ...
     @property
     def name(self) -> str: ...
     def model_class(self) -> Optional[Type[Model]]: ...

django-stubs/contrib/flatpages/forms.pyi

@@ -1,22 +1,7 @@
-from typing import Any, Dict, Optional, Union
+from typing import Any
 
 from django import forms
-from django.db.models.query import QuerySet
 
 class FlatpageForm(forms.ModelForm):
-    auto_id: str
-    data: Dict[str, Union[List[int], str]]
-    empty_permitted: bool
-    error_class: Type[ErrorList]
-    fields: collections.OrderedDict
-    files: Dict[Any, Any]
-    initial: Dict[str, Union[List[django.contrib.sites.models.Site], int, str]]
-    instance: django.contrib.flatpages.models.FlatPage
-    is_bound: bool
-    label_suffix: str
     url: Any = ...
-    class Meta:
-        model: Any = ...
-        fields: str = ...
     def clean_url(self) -> str: ...
-    def clean(self) -> Dict[str, Union[bool, QuerySet, str]]: ...

django-stubs/contrib/flatpages/models.pyi

@@ -1,19 +1,13 @@
-from typing import Any, Optional
+from django.contrib.sites.models import Site
 
 from django.db import models
 
 class FlatPage(models.Model):
-    id: None
-    url: str = ...
-    title: str = ...
-    content: str = ...
-    enable_comments: bool = ...
-    template_name: str = ...
-    registration_required: bool = ...
-    sites: Any = ...
-    class Meta:
-        db_table: str = ...
-        verbose_name: Any = ...
-        verbose_name_plural: Any = ...
-        ordering: Any = ...
+    url: models.CharField = ...
+    title: models.CharField = ...
+    content: models.TextField = ...
+    enable_comments: models.BooleanField = ...
+    template_name: models.CharField = ...
+    registration_required: models.BooleanField = ...
+    sites: models.ManyToManyField[Site, Site] = ...
     def get_absolute_url(self) -> str: ...

django-stubs/contrib/flatpages/sitemaps.pyi

@@ -1,7 +1,3 @@
-from typing import Optional
-
 from django.contrib.sitemaps import Sitemap
-from django.db.models.query import QuerySet
 
-class FlatPageSitemap(Sitemap):
-    def items(self) -> QuerySet: ...
+class FlatPageSitemap(Sitemap): ...

django-stubs/contrib/messages/__init__.pyi

@@ -1 +1,24 @@
-from .api import get_level as get_level, set_level as set_level
+from .api import (
+    get_level as get_level,
+    set_level as set_level,
+    add_message as add_message,
+    debug as debug,
+    error as error,
+    success as success,
+    get_messages as get_messages,
+    MessageFailure as MessageFailure,
+    info as info,
+    warning as warning,
+)
+
+from .constants import (
+    DEBUG as DEBUG,
+    DEFAULT_LEVELS as DEFAULT_LEVELS,
+    DEFAULT_TAGS as DEFAULT_TAGS,
+    ERROR as ERROR,
+    INFO as INFO,
+    SUCCESS as SUCCESS,
+    WARNING as WARNING,
+)
+
+default_app_config: str = ...

django-stubs/contrib/messages/api.pyi

@@ -1,13 +1,12 @@
 from typing import Any, List, Optional, Union
 
 from django.contrib.messages.storage.base import BaseStorage
-from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
 
 class MessageFailure(Exception): ...
 
 def add_message(
-    request: Optional[WSGIRequest],
+    request: Optional[HttpRequest],
     level: int,
     message: str,
     extra_tags: str = ...,
@@ -16,12 +15,12 @@ def add_message(
 def get_messages(request: HttpRequest) -> Union[List[Any], BaseStorage]: ...
 def get_level(request: HttpRequest) -> int: ...
 def set_level(request: HttpRequest, level: int) -> bool: ...
-def debug(request: WSGIRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...) -> None: ...
-def info(request: WSGIRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...) -> None: ...
+def debug(request: HttpRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...) -> None: ...
+def info(request: HttpRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...) -> None: ...
 def success(
-    request: WSGIRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...
+    request: HttpRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...
 ) -> None: ...
 def warning(
-    request: WSGIRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...
+    request: HttpRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...
 ) -> None: ...
-def error(request: WSGIRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...) -> None: ...
+def error(request: HttpRequest, message: str, extra_tags: str = ..., fail_silently: Union[bool, str] = ...) -> None: ...

django-stubs/contrib/messages/constants.pyi

@@ -0,0 +1,11 @@
+from typing import Dict
+
+DEBUG: int = ...
+INFO: int = ...
+SUCCESS: int = ...
+WARNING: int = ...
+ERROR: int = ...
+
+DEFAULT_TAGS: Dict[int, str] = ...
+
+DEFAULT_LEVELS: Dict[str, int] = ...

django-stubs/contrib/messages/middleware.pyi

@@ -1,8 +1,7 @@
-from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
-from django.http.response import HttpResponseBase
+from django.http.response import HttpResponse
 from django.utils.deprecation import MiddlewareMixin
 
 class MessageMiddleware(MiddlewareMixin):
-    def process_request(self, request: WSGIRequest) -> None: ...
-    def process_response(self, request: HttpRequest, response: HttpResponseBase) -> HttpResponseBase: ...
+    def process_request(self, request: HttpRequest) -> None: ...
+    def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...

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

@@ -16,7 +16,7 @@ class Message:
     def level_tag(self) -> str: ...
 
 class BaseStorage:
-    request: Any = ...
+    request: HttpRequest = ...
     used: bool = ...
     added_new: bool = ...
     def __init__(self, request: HttpRequest, *args: Any, **kwargs: Any) -> None: ...

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

@@ -1,49 +1,20 @@
 import json
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
 
-from django.contrib.messages.storage.base import BaseStorage, Message
+from django.contrib.messages.storage.base import BaseStorage
 
 class MessageEncoder(json.JSONEncoder):
     allow_nan: bool
     check_circular: bool
     ensure_ascii: bool
-    indent: None
-    item_separator: str
-    key_separator: str
     skipkeys: bool
     sort_keys: bool
     message_key: str = ...
-    def default(self, obj: Message) -> List[Union[int, str]]: ...
 
 class MessageDecoder(json.JSONDecoder):
-    def process_messages(
-        self,
-        obj: Union[
-            Dict[
-                str, Union[List[Union[Dict[str, List[Union[int, str]]], List[Union[int, str]]]], List[Union[int, str]]]
-            ],
-            List[Union[List[Union[int, str]], str]],
-            str,
-        ],
-    ) -> Union[
-        Dict[str, Union[List[Union[Dict[str, Message], Message]], Message]],
-        List[Union[Dict[str, Union[List[Union[Dict[str, Message], Message]], Message]], Message]],
-        List[Union[Message, str]],
-        Message,
-        str,
-    ]: ...
-    def decode(
-        self, s: str, **kwargs: Any
-    ) -> Union[
-        List[Union[Dict[str, Union[List[Union[Dict[str, Message], Message]], Message]], Message]],
-        List[Union[Message, str]],
-        Message,
-    ]: ...
+    def process_messages(self, obj: Any) -> Any: ...
 
 class CookieStorage(BaseStorage):
-    added_new: bool
-    request: WSGIRequest
-    used: bool
     cookie_name: str = ...
     max_cookie_size: int = ...
     not_finished: str = ...

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

@@ -1,11 +1,8 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.contrib.messages.storage.base import BaseStorage
 
 class FallbackStorage(BaseStorage):
-    added_new: bool
-    request: WSGIRequest
-    used: bool
     storage_classes: Any = ...
     storages: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...

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

@@ -1,15 +1,10 @@
-from typing import Any, List, Optional, Union
+from typing import Any, List, Optional, Sequence, Union
 
-from django.contrib.messages.storage.base import BaseStorage, Message
+from django.contrib.messages.storage.base import BaseStorage
 from django.http.request import HttpRequest
 
 class SessionStorage(BaseStorage):
-    added_new: bool
-    request: WSGIRequest
-    used: bool
     session_key: str = ...
     def __init__(self, request: HttpRequest, *args: Any, **kwargs: Any) -> None: ...
-    def serialize_messages(self, messages: Union[List[Message], List[str]]) -> str: ...
-    def deserialize_messages(
-        self, data: Optional[Union[List[Any], str]]
-    ) -> Optional[Union[List[Message], List[str]]]: ...
+    def serialize_messages(self, messages: Sequence[Any]) -> str: ...
+    def deserialize_messages(self, data: Optional[Union[List[Any], str]]) -> Optional[List[Any]]: ...

django-stubs/contrib/messages/views.pyi

@@ -1,9 +1,9 @@
 from typing import Any, Dict, Optional
 
-from django.forms.forms import Form
-from django.http.response import HttpResponseRedirect
+from django.forms.forms import BaseForm
+from django.http.response import HttpResponse
 
 class SuccessMessageMixin:
     success_message: str = ...
-    def form_valid(self, form: Form) -> HttpResponseRedirect: ...
+    def form_valid(self, form: BaseForm) -> HttpResponse: ...
     def get_success_message(self, cleaned_data: Dict[str, str]) -> str: ...

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

@@ -4,7 +4,15 @@ from .ranges import (
     RangeField as RangeField,
     IntegerRangeField as IntegerRangeField,
     BigIntegerRangeField as BigIntegerRangeField,
+    DecimalRangeField as DecimalRangeField,
     FloatRangeField as FloatRangeField,
     DateRangeField as DateRangeField,
     DateTimeRangeField as DateTimeRangeField,
 )
+from .hstore import HStoreField as HStoreField
+from .citext import (
+    CICharField as CICharField,
+    CIEmailField as CIEmailField,
+    CIText as CIText,
+    CITextField as CITextField,
+)

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

@@ -1,26 +1,51 @@
-from typing import Any, Dict, List, Optional, Tuple, Union, TypeVar, Generic, Sequence
+from typing import Any, Iterable, List, Optional, Sequence, TypeVar, Union
+
+from django.db.models.expressions import Combinable
+from django.db.models.fields import Field, _ErrorMessagesToOverride, _FieldChoices, _ValidatorCallable
 
-from django.db.models.fields import Field
 from .mixins import CheckFieldDefaultMixin
 
-_T = TypeVar("_T", bound=Field)
+# __set__ value type
+_ST = TypeVar("_ST")
+# __get__ return type
+_GT = TypeVar("_GT")
+
+class ArrayField(CheckFieldDefaultMixin, Field[_ST, _GT]):
+    _pyi_private_set_type: Union[Sequence[Any], Combinable]
+    _pyi_private_get_type: List[Any]
 
-class ArrayField(CheckFieldDefaultMixin, Field, Generic[_T]):
     empty_strings_allowed: bool = ...
     default_error_messages: Any = ...
     base_field: Any = ...
     size: Any = ...
     default_validators: Any = ...
     from_db_value: Any = ...
-    def __init__(self, base_field: _T, size: None = ..., **kwargs: Any) -> None: ...
-    def check(self, **kwargs: Any) -> List[Any]: ...
+    def __init__(
+        self,
+        base_field: Field,
+        size: Optional[int] = ...,
+        verbose_name: Optional[Union[str, bytes]] = ...,
+        name: Optional[str] = ...,
+        primary_key: bool = ...,
+        max_length: Optional[int] = ...,
+        unique: bool = ...,
+        blank: bool = ...,
+        null: bool = ...,
+        db_index: bool = ...,
+        default: Any = ...,
+        editable: bool = ...,
+        auto_created: bool = ...,
+        serialize: bool = ...,
+        unique_for_date: Optional[str] = ...,
+        unique_for_month: Optional[str] = ...,
+        unique_for_year: Optional[str] = ...,
+        choices: Optional[_FieldChoices] = ...,
+        help_text: str = ...,
+        db_column: Optional[str] = ...,
+        db_tablespace: Optional[str] = ...,
+        validators: Iterable[_ValidatorCallable] = ...,
+        error_messages: Optional[_ErrorMessagesToOverride] = ...,
+    ) -> None: ...
     @property
     def description(self): ...
-    def get_db_prep_value(self, value: Any, connection: Any, prepared: bool = ...): ...
-    def to_python(self, value: Any): ...
-    def value_to_string(self, obj: Any): ...
     def get_transform(self, name: Any): ...
-    def validate(self, value: Any, model_instance: Any) -> None: ...
-    def run_validators(self, value: Any) -> None: ...
-    def __set__(self, instance, value: Sequence[_T]): ...
-    def __get__(self, instance, owner) -> List[_T]: ...

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

@@ -0,0 +1,17 @@
+from typing import Any
+
+from django.db.models import Field, Transform
+from .mixins import CheckFieldDefaultMixin
+
+class HStoreField(CheckFieldDefaultMixin, Field):
+    def get_transform(self, name) -> Any: ...
+
+class KeyTransform(Transform):
+    def __init__(self, key_name: str, *args: Any, **kwargs: Any): ...
+
+class KeyTransformFactory:
+    def __init__(self, key_name: str): ...
+    def __call__(self, *args, **kwargs) -> KeyTransform: ...
+
+class KeysTransform(Transform): ...
+class ValuesTransform(Transform): ...

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

@@ -1,10 +1,11 @@
 from json import JSONEncoder
-from typing import Any, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Optional, Type
 
 from django.db.models import Field
+from django.db.models.lookups import Transform
 from .mixins import CheckFieldDefaultMixin
 
-class JsonAdapter(object):
+class JsonAdapter:
     encoder: Any = ...
     def __init__(self, adapted: Any, dumps: Optional[Any] = ..., encoder: Optional[Any] = ...) -> None: ...
     def dumps(self, obj: Any): ...
@@ -15,12 +16,17 @@ class JSONField(CheckFieldDefaultMixin, Field):
     default_error_messages: Any = ...
     encoder: Any = ...
     def __init__(
-        self, verbose_name: None = ..., name: None = ..., encoder: Optional[Type[JSONEncoder]] = ..., **kwargs: Any
+        self,
+        verbose_name: Optional[str] = ...,
+        name: Optional[str] = ...,
+        encoder: Optional[Type[JSONEncoder]] = ...,
+        **kwargs: Any
     ) -> None: ...
-    def db_type(self, connection: Any): ...
-    def deconstruct(self) -> Tuple[None, str, List[Any], Dict[str, Union[Type[JSONEncoder], bool]]]: ...
-    def get_transform(self, name: Any): ...
-    def get_prep_value(self, value: Any): ...
-    def validate(self, value: Any, model_instance: Any) -> None: ...
     def value_to_string(self, obj: Any): ...
-    def formfield(self, **kwargs: Any): ...
+
+class KeyTransform(Transform):
+    operator: str = ...
+    nested_operator: str = ...
+    def __init__(self, key_name: str, *args: Any, **kwargs: Any) -> None: ...
+
+class KeyTextTransform(KeyTransform): ...

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

@@ -2,6 +2,8 @@ from typing import Any
 
 from django.db import models
 
+from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange  # type: ignore
+
 class RangeField(models.Field):
     empty_strings_allowed: bool = ...
     base_field: Any = ...
@@ -10,8 +12,20 @@ class RangeField(models.Field):
     def to_python(self, value: Any): ...
     def value_to_string(self, obj: Any): ...
 
-class IntegerRangeField(RangeField): ...
-class BigIntegerRangeField(RangeField): ...
-class FloatRangeField(RangeField): ...
-class DateTimeRangeField(RangeField): ...
-class DateRangeField(RangeField): ...
+class IntegerRangeField(RangeField):
+    def __get__(self, instance, owner) -> NumericRange: ...
+
+class BigIntegerRangeField(RangeField):
+    def __get__(self, instance, owner) -> NumericRange: ...
+
+class DecimalRangeField(RangeField):
+    def __get__(self, instance, owner) -> NumericRange: ...
+
+class FloatRangeField(RangeField):
+    def __get__(self, instance, owner) -> NumericRange: ...
+
+class DateTimeRangeField(RangeField):
+    def __get__(self, instance, owner) -> DateTimeTZRange: ...
+
+class DateRangeField(RangeField):
+    def __get__(self, instance, owner) -> DateRange: ...

django-stubs/contrib/postgres/functions.pyi

@@ -0,0 +1,4 @@
+from django.db.models import Func
+
+class RandomUUID(Func): ...
+class TransactionNow(Func): ...

django-stubs/contrib/postgres/indexes.pyi

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

django-stubs/contrib/postgres/search.pyi

@@ -0,0 +1,47 @@
+from typing import Any, Dict, Optional, TypeVar, Union
+
+from django.db.models.expressions import Combinable, CombinedExpression, Func, Value
+from django.db.models.lookups import Lookup
+
+from django.db.models import Field
+
+class SearchVectorExact(Lookup): ...
+class SearchVectorField(Field): ...
+class SearchQueryField(Field): ...
+
+class SearchVectorCombinable:
+    ADD: str = ...
+
+class SearchVector(SearchVectorCombinable, Func):
+    config: Optional[Any] = None
+    def __init__(self, *expressions: Union[str, Combinable], **extra: Any): ...
+
+class CombinedSearchVector(SearchVectorCombinable, CombinedExpression):
+    def __init__(self, lhs, connector, rhs, config, output_field: Optional[Field, str] = ...): ...
+
+_T = TypeVar("_T", bound="SearchQueryCombinable")
+
+class SearchQueryCombinable:
+    BITAND: str = ...
+    BITOR: str = ...
+    def __or__(self: _T, other: SearchQueryCombinable) -> _T: ...
+    def __ror__(self: _T, other: SearchQueryCombinable) -> _T: ...
+    def __and__(self: _T, other: SearchQueryCombinable) -> _T: ...
+    def __rand__(self: _T, other: SearchQueryCombinable) -> _T: ...
+
+class SearchQuery(SearchQueryCombinable, Value):
+    SEARCH_TYPES: Dict[str, str] = {"plain": "plainto_tsquery", "phrase": "phraseto_tsquery", "raw": "to_tsquery"}
+    def __init__(self, value, output_field=None, *, config=None, invert=False, search_type="plain"): ...
+    def __invert__(self: _T) -> _T: ...
+
+class CombinedSearchQuery(SearchQueryCombinable, CombinedExpression):
+    def __init__(self, lhs, connector, rhs, config, output_field=None) -> None: ...
+
+class SearchRank(Func):
+    def __init__(self, vector, query, **extra: Any) -> None: ...
+
+class TrigramBase(Func):
+    def __init__(self, expression, string, **extra: Any) -> None: ...
+
+class TrigramSimilarity(TrigramBase): ...
+class TrigramDistance(TrigramBase): ...

django-stubs/contrib/postgres/signals.pyi

@@ -0,0 +1,5 @@
+from typing import Any, Tuple
+
+def get_hstore_oids(connection_alias: str) -> Tuple[Any, ...]: ...
+def get_citext_oids(connection_alias: str) -> Tuple[Any, ...]: ...
+def register_type_handlers(connection: Any, **kwargs: Any) -> None: ...

django-stubs/contrib/postgres/validators.pyi

@@ -0,0 +1,17 @@
+from typing import Any, Dict, Iterable, Mapping, Optional
+
+from django.core.validators import MaxLengthValidator, MaxValueValidator, MinLengthValidator, MinValueValidator
+
+class ArrayMaxLengthValidator(MaxLengthValidator): ...
+class ArrayMinLengthValidator(MinLengthValidator): ...
+
+class KeysValidator:
+    messages: Dict[str, str] = ...
+    strict: bool = ...
+    def __init__(
+        self, keys: Iterable[str], strict: bool = ..., messages: Optional[Mapping[str, str]] = ...
+    ) -> None: ...
+    def __call__(self, value: Any) -> None: ...
+
+class RangeMaxValueValidator(MaxValueValidator): ...
+class RangeMinValueValidator(MinValueValidator): ...

django-stubs/contrib/redirects/middleware.pyi

@@ -1,10 +1,10 @@
 from typing import Any
 
-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 RedirectFallbackMiddleware(MiddlewareMixin):
     response_gone_class: Any = ...
     response_redirect_class: Any = ...
-    def process_response(self, request: WSGIRequest, response: HttpResponse) -> HttpResponse: ...
+    def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...

django-stubs/contrib/redirects/models.pyi

@@ -1,16 +1,6 @@
-from typing import Any, Optional
-
 from django.db import models
 
 class Redirect(models.Model):
-    id: None
-    site_id: int
-    site: Any = ...
-    old_path: str = ...
-    new_path: str = ...
-    class Meta:
-        verbose_name: Any = ...
-        verbose_name_plural: Any = ...
-        db_table: str = ...
-        unique_together: Any = ...
-        ordering: Any = ...
+    site: models.ForeignKey = ...
+    old_path: models.CharField = ...
+    new_path: models.CharField = ...

django-stubs/contrib/sessions/backends/base.pyi

@@ -1,33 +1,23 @@
 from datetime import datetime
 from typing import Any, Dict, Optional, Union
 
-from django.db.models.base import Model
-
 VALID_KEY_CHARS: Any
 
 class CreateError(Exception): ...
 class UpdateError(Exception): ...
 
-class SessionBase:
+class SessionBase(Dict[str, Any]):
     TEST_COOKIE_NAME: str = ...
     TEST_COOKIE_VALUE: str = ...
     accessed: bool = ...
     modified: bool = ...
     serializer: Any = ...
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
-    def __contains__(self, key: str) -> bool: ...
-    def __getitem__(self, key: str) -> Any: ...
-    def __setitem__(self, key: str, value: Any) -> None: ...
-    def __delitem__(self, key: str) -> None: ...
-    def get(self, key: str, default: Optional[str] = ...) -> Any: ...
-    def pop(self, key: str, default: Any = ...) -> Any: ...
-    def setdefault(self, key: str, value: str) -> str: ...
     def set_test_cookie(self) -> None: ...
     def test_cookie_worked(self) -> bool: ...
     def delete_test_cookie(self) -> None: ...
-    def encode(self, session_dict: Dict[str, Model]) -> str: ...
-    def decode(self, session_data: Union[bytes, str]) -> Dict[str, Model]: ...
-    def update(self, dict_: Dict[str, int]) -> None: ...
+    def encode(self, session_dict: Dict[str, Any]) -> str: ...
+    def decode(self, session_data: Union[bytes, str]) -> Dict[str, Any]: ...
     def has_key(self, key: Any): ...
     def keys(self): ...
     def values(self): ...
@@ -41,7 +31,7 @@ class SessionBase:
     def get_expire_at_browser_close(self) -> bool: ...
     def flush(self) -> None: ...
     def cycle_key(self) -> None: ...
-    def exists(self, session_key: str) -> None: ...
+    def exists(self, session_key: str) -> bool: ...
     def create(self) -> None: ...
     def save(self, must_create: bool = ...) -> None: ...
     def delete(self, session_key: Optional[Any] = ...) -> None: ...

django-stubs/contrib/sessions/backends/cache.pyi

@@ -1,23 +1,11 @@
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from django.contrib.sessions.backends.base import SessionBase
 
-from django.contrib.sessions.serializers import JSONSerializer
-
 KEY_PREFIX: str
 
 class SessionStore(SessionBase):
-    accessed: bool
-    serializer: JSONSerializer
     cache_key_prefix: Any = ...
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
     @property
     def cache_key(self) -> str: ...
-    def load(self) -> Dict[str, str]: ...
-    modified: bool = ...
-    def create(self) -> None: ...
-    def save(self, must_create: bool = ...) -> None: ...
-    def exists(self, session_key: Optional[str]) -> bool: ...
-    def delete(self, session_key: Optional[str] = ...) -> None: ...
-    @classmethod
-    def clear_expired(cls) -> None: ...

django-stubs/contrib/sessions/backends/cached_db.pyi

@@ -1,19 +1,11 @@
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from django.contrib.sessions.backends.db import SessionStore as DBStore
 
 KEY_PREFIX: str
 
 class SessionStore(DBStore):
-    accessed: bool
-    modified: bool
-    serializer: Type[django.core.signing.JSONSerializer]
     cache_key_prefix: Any = ...
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
     @property
     def cache_key(self) -> str: ...
-    def load(self) -> Dict[str, str]: ...
-    def exists(self, session_key: Optional[str]) -> bool: ...
-    def save(self, must_create: bool = ...) -> None: ...
-    def delete(self, session_key: Optional[str] = ...) -> None: ...
-    def flush(self) -> None: ...

django-stubs/contrib/sessions/backends/db.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Type, Union
+from typing import Dict, Optional, Type
 
 from django.contrib.sessions.backends.base import SessionBase
 from django.contrib.sessions.base_session import AbstractBaseSession
@@ -6,18 +6,8 @@ from django.contrib.sessions.models import Session
 from django.db.models.base import Model
 
 class SessionStore(SessionBase):
-    accessed: bool
-    serializer: Type[django.core.signing.JSONSerializer]
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
     @classmethod
     def get_model_class(cls) -> Type[Session]: ...
     def model(self) -> Type[AbstractBaseSession]: ...
-    def load(self) -> Dict[str, Union[Model, int, str]]: ...
-    def exists(self, session_key: Optional[str]) -> bool: ...
-    modified: bool = ...
-    def create(self) -> None: ...
     def create_model_instance(self, data: Dict[str, Model]) -> AbstractBaseSession: ...
-    def save(self, must_create: bool = ...) -> None: ...
-    def delete(self, session_key: Optional[str] = ...) -> None: ...
-    @classmethod
-    def clear_expired(cls) -> None: ...

django-stubs/contrib/sessions/backends/file.pyi

@@ -1,19 +1,9 @@
-from typing import Any, Dict, Optional, Union
+from typing import Optional
 
 from django.contrib.sessions.backends.base import SessionBase
 
 class SessionStore(SessionBase):
-    accessed: bool
-    serializer: Type[django.core.signing.JSONSerializer]
     storage_path: str = ...
     file_prefix: str = ...
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
-    def load(self) -> Dict[str, Union[int, str]]: ...
-    modified: bool = ...
-    def create(self) -> None: ...
-    def save(self, must_create: bool = ...) -> None: ...
-    def exists(self, session_key: Optional[str]) -> bool: ...
-    def delete(self, session_key: Optional[str] = ...) -> None: ...
     def clean(self) -> None: ...
-    @classmethod
-    def clear_expired(cls) -> None: ...

django-stubs/contrib/sessions/backends/signed_cookies.pyi

@@ -1,17 +1,3 @@
-from datetime import datetime
-from typing import Any, Dict, Optional, Union
-
 from django.contrib.sessions.backends.base import SessionBase
 
-class SessionStore(SessionBase):
-    accessed: bool
-    serializer: Type[django.core.signing.JSONSerializer]
-    def load(self) -> Dict[str, Union[datetime, str]]: ...
-    modified: bool = ...
-    def create(self) -> None: ...
-    def save(self, must_create: bool = ...) -> None: ...
-    def exists(self, session_key: Optional[str] = ...) -> bool: ...
-    def delete(self, session_key: Optional[str] = ...) -> None: ...
-    def cycle_key(self) -> None: ...
-    @classmethod
-    def clear_expired(cls) -> None: ...
+class SessionStore(SessionBase): ...

django-stubs/contrib/sessions/base_session.pyi

@@ -1,24 +1,19 @@
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Type
+
+from django.contrib.sessions.backends.base import SessionBase
 
 from django.db import models
 
 class BaseSessionManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
     def encode(self, session_dict: Dict[str, int]) -> str: ...
     def save(self, session_key: str, session_dict: Dict[str, int], expire_date: datetime) -> AbstractBaseSession: ...
 
 class AbstractBaseSession(models.Model):
-    session_key: Any = ...
-    session_data: Any = ...
-    expire_date: Any = ...
+    expire_date: datetime
+    session_data: str
+    session_key: str
     objects: Any = ...
-    class Meta:
-        abstract: bool = ...
-        verbose_name: Any = ...
-        verbose_name_plural: Any = ...
     @classmethod
-    def get_session_store_class(cls) -> None: ...
+    def get_session_store_class(cls) -> Optional[Type[SessionBase]]: ...
     def get_decoded(self) -> Dict[str, int]: ...

django-stubs/contrib/sessions/exceptions.pyi

@@ -0,0 +1,4 @@
+from django.core.exceptions import SuspiciousOperation
+
+class InvalidSessionKey(SuspiciousOperation): ...
+class SuspiciousSession(SuspiciousOperation): ...

django-stubs/contrib/sessions/management/commands/clearsessions.pyi

@@ -1,10 +1,3 @@
-from typing import Any, Optional
-
 from django.core.management.base import BaseCommand
 
-class Command(BaseCommand):
-    stderr: django.core.management.base.OutputWrapper
-    stdout: django.core.management.base.OutputWrapper
-    style: django.core.management.color.Style
-    help: str = ...
-    def handle(self, **options: Any) -> None: ...
+class Command(BaseCommand): ...

django-stubs/contrib/sessions/middleware.pyi

@@ -1,11 +1,11 @@
 from typing import Type
 
 from django.contrib.sessions.backends.base import SessionBase
-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 SessionMiddleware(MiddlewareMixin):
     SessionStore: Type[SessionBase] = ...
-    def process_request(self, request: WSGIRequest) -> None: ...
-    def process_response(self, request: WSGIRequest, response: HttpResponse) -> HttpResponse: ...
+    def process_request(self, request: HttpRequest) -> None: ...
+    def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...

django-stubs/contrib/sessions/models.pyi

@@ -1,20 +1,4 @@
-from typing import Any, Optional, Type
-
-from django.contrib.sessions.backends.db import SessionStore
 from django.contrib.sessions.base_session import AbstractBaseSession, BaseSessionManager
 
-class SessionManager(BaseSessionManager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
-
-class Session(AbstractBaseSession):
-    expire_date: datetime.datetime
-    session_data: str
-    session_key: str
-    objects: Any = ...
-    @classmethod
-    def get_session_store_class(cls) -> Type[SessionStore]: ...
-    class Meta(AbstractBaseSession.Meta):
-        db_table: str = ...
+class SessionManager(BaseSessionManager): ...
+class Session(AbstractBaseSession): ...

django-stubs/contrib/sessions/serializers.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Dict
 
 from django.core.signing import JSONSerializer as BaseJSONSerializer
 from django.db.models.base import Model

django-stubs/contrib/sitemaps/__init__.pyi

@@ -11,25 +11,24 @@ PING_URL: str
 
 class SitemapNotFound(Exception): ...
 
-def ping_google(sitemap_url: None = ..., ping_url: str = ...) -> None: ...
+def ping_google(sitemap_url: Optional[str] = ..., ping_url: str = ...) -> None: ...
 
 class Sitemap:
     limit: int = ...
-    protocol: Any = ...
+    protocol: Optional[str] = ...
     def items(self) -> List[Any]: ...
     def location(self, obj: Model) -> str: ...
     @property
     def paginator(self) -> Paginator: ...
     def get_urls(
         self, page: Union[int, str] = ..., site: Optional[Union[Site, RequestSite]] = ..., protocol: Optional[str] = ...
-    ) -> List[Dict[str, Optional[Union[datetime, Model, str]]]]: ...
+    ) -> List[Dict[str, Any]]: ...
 
 class GenericSitemap(Sitemap):
-    priority: None = ...
-    changefreq: None = ...
+    priority: Optional[float] = ...
+    changefreq: Optional[str] = ...
     queryset: QuerySet = ...
     date_field: None = ...
-    protocol: None = ...
     def __init__(
         self,
         info_dict: Dict[str, Union[datetime, QuerySet, str]],
@@ -37,7 +36,6 @@ class GenericSitemap(Sitemap):
         changefreq: Optional[str] = ...,
         protocol: Optional[str] = ...,
     ) -> None: ...
-    def items(self) -> QuerySet: ...
     def lastmod(self, item: Model) -> Optional[datetime]: ...
 
 default_app_config: str

django-stubs/contrib/sitemaps/views.pyi

@@ -1,20 +1,21 @@
 from collections import OrderedDict
-from typing import Any, Callable, Dict, Optional, Type, Union
+from typing import Callable, Dict, Optional, Type, Union
+
+from django.http.request import HttpRequest
+from django.template.response import TemplateResponse
 
 from django.contrib.sitemaps import GenericSitemap, Sitemap
-from django.core.handlers.wsgi import WSGIRequest
-from django.template.response import TemplateResponse
 
 def x_robots_tag(func: Callable) -> Callable: ...
 def index(
-    request: WSGIRequest,
+    request: HttpRequest,
     sitemaps: Dict[str, Union[Type[Sitemap], Sitemap]],
     template_name: str = ...,
     content_type: str = ...,
     sitemap_url_name: str = ...,
 ) -> TemplateResponse: ...
 def sitemap(
-    request: WSGIRequest,
+    request: HttpRequest,
     sitemaps: Union[Dict[str, Type[Sitemap]], Dict[str, GenericSitemap], OrderedDict],
     section: Optional[str] = ...,
     template_name: str = ...,

django-stubs/contrib/sites/apps.pyi

@@ -1,14 +1,3 @@
-from typing import Any
-
 from django.apps import AppConfig
 
-class SitesConfig(AppConfig):
-    apps: None
-    label: str
-    models: None
-    models_module: None
-    module: Any
-    path: str
-    name: str = ...
-    verbose_name: Any = ...
-    def ready(self) -> None: ...
+class SitesConfig(AppConfig): ...

django-stubs/contrib/sites/managers.pyi

@@ -1,15 +1,6 @@
-from typing import Any, List, Optional
-
-from django.core.checks.messages import Error
-from django.db.models.query import QuerySet
+from typing import Optional
 
 from django.db import models
 
 class CurrentSiteManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def __init__(self, field_name: Optional[str] = ...) -> None: ...
-    def check(self, **kwargs: Any) -> List[Error]: ...
-    def get_queryset(self) -> QuerySet: ...

django-stubs/contrib/sites/models.pyi

@@ -7,24 +7,14 @@ from django.db import models
 SITE_CACHE: Any
 
 class SiteManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def get_current(self, request: Optional[HttpRequest] = ...) -> Site: ...
     def clear_cache(self) -> None: ...
     def get_by_natural_key(self, domain: str) -> Site: ...
 
 class Site(models.Model):
-    id: int
-    domain: str = ...
-    name: str = ...
-    objects: Any = ...
-    class Meta:
-        db_table: str = ...
-        verbose_name: Any = ...
-        verbose_name_plural: Any = ...
-        ordering: Any = ...
+    domain: models.CharField = ...
+    name: models.CharField = ...
+    objects: SiteManager = ...
     def natural_key(self) -> Tuple[str]: ...
 
 def clear_site_cache(sender: Type[Site], **kwargs: Any) -> None: ...

django-stubs/contrib/staticfiles/apps.pyi

@@ -1,15 +1,6 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.apps import AppConfig
 
 class StaticFilesConfig(AppConfig):
-    apps: None
-    label: str
-    models: None
-    models_module: None
-    module: Any
-    path: str
-    name: str = ...
-    verbose_name: Any = ...
     ignore_patterns: Any = ...
-    def ready(self) -> None: ...

django-stubs/contrib/staticfiles/finders.pyi

@@ -1,45 +1,43 @@
-from typing import Any, Iterator, List, Optional, Tuple, Union
+from typing import Any, Iterable, Iterator, List, Mapping, Optional, Union, overload
 
-from django.contrib.staticfiles.storage import StaticFilesStorage
 from django.core.checks.messages import Error
-from django.core.files.storage import DefaultStorage, FileSystemStorage
+from django.core.files.storage import Storage
+from typing_extensions import Literal
 
 searched_locations: Any
 
 class BaseFinder:
-    def check(self, **kwargs: Any) -> Any: ...
-    def find(self, path: Any, all: bool = ...) -> None: ...
-    def list(self, ignore_patterns: Any) -> None: ...
+    def check(self, **kwargs: Any) -> List[Error]: ...
+    def find(self, path: str, all: bool = ...) -> Optional[Any]: ...
+    def list(self, ignore_patterns: Any) -> Iterable[Any]: ...
 
 class FileSystemFinder(BaseFinder):
     locations: List[Any] = ...
-    storages: collections.OrderedDict = ...
+    storages: Mapping[str, Any] = ...
     def __init__(self, app_names: None = ..., *args: Any, **kwargs: Any) -> None: ...
-    def check(self, **kwargs: Any) -> List[Error]: ...
-    def find(self, path: str, all: bool = ...) -> Union[List[str], str]: ...
     def find_location(self, root: str, path: str, prefix: str = ...) -> Optional[str]: ...
-    def list(self, ignore_patterns: List[str]) -> Iterator[Tuple[str, FileSystemStorage]]: ...
 
 class AppDirectoriesFinder(BaseFinder):
     storage_class: Any = ...
     source_dir: str = ...
     apps: List[str] = ...
-    storages: collections.OrderedDict = ...
+    storages: Mapping[str, Any] = ...
     def __init__(self, app_names: None = ..., *args: Any, **kwargs: Any) -> None: ...
-    def list(self, ignore_patterns: List[str]) -> Iterator[Tuple[str, FileSystemStorage]]: ...
-    def find(self, path: str, all: bool = ...) -> Union[List[str], str]: ...
     def find_in_app(self, app: str, path: str) -> Optional[str]: ...
 
 class BaseStorageFinder(BaseFinder):
-    storage: Any = ...
-    def __init__(self, storage: Optional[StaticFilesStorage] = ..., *args: Any, **kwargs: Any) -> None: ...
-    def find(self, path: str, all: bool = ...) -> Union[List[str], str]: ...
-    def list(self, ignore_patterns: List[str]) -> Iterator[Tuple[str, DefaultStorage]]: ...
+    storage: Storage = ...
+    def __init__(self, storage: Optional[Storage] = ..., *args: Any, **kwargs: Any) -> None: ...
 
-class DefaultStorageFinder(BaseStorageFinder):
-    storage: django.contrib.staticfiles.storage.StaticFilesStorage = ...
-    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+class DefaultStorageFinder(BaseStorageFinder): ...
 
 def find(path: str, all: bool = ...) -> Optional[Union[List[str], str]]: ...
 def get_finders() -> Iterator[BaseFinder]: ...
+@overload
+def get_finder(import_path: Literal["django.contrib.staticfiles.finders.FileSystemFinder"]) -> FileSystemFinder: ...
+@overload
+def get_finder(
+    import_path: Literal["django.contrib.staticfiles.finders.AppDirectoriesFinder"]
+) -> AppDirectoriesFinder: ...
+@overload
 def get_finder(import_path: str) -> BaseFinder: ...

django-stubs/contrib/staticfiles/handlers.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.core.handlers.wsgi import WSGIHandler, WSGIRequest
 
@@ -7,9 +7,6 @@ class StaticFilesHandler(WSGIHandler):
     application: WSGIHandler = ...
     base_url: Any = ...
     def __init__(self, application: WSGIHandler) -> None: ...
-    def load_middleware(self) -> None: ...
     def get_base_url(self) -> str: ...
     def file_path(self, url: str) -> str: ...
     def serve(self, request: WSGIRequest) -> Any: ...
-    def get_response(self, request: WSGIRequest) -> Any: ...
-    def __call__(self, environ: Any, start_response: Any): ...

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

@@ -1,22 +1,16 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List
 
 from django.core.files.storage import FileSystemStorage
-from django.core.management.base import BaseCommand, CommandParser
+from django.core.management.base import BaseCommand
 
 class Command(BaseCommand):
-    stderr: django.core.management.base.OutputWrapper
-    stdout: django.core.management.base.OutputWrapper
-    help: str = ...
-    requires_system_checks: bool = ...
     copied_files: Any = ...
     symlinked_files: Any = ...
     unmodified_files: Any = ...
     post_processed_files: Any = ...
     storage: Any = ...
-    style: django.core.management.color.Style = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def local(self) -> bool: ...
-    def add_arguments(self, parser: CommandParser) -> None: ...
     interactive: Any = ...
     verbosity: Any = ...
     symlink: Any = ...
@@ -26,7 +20,6 @@ class Command(BaseCommand):
     post_process: Any = ...
     def set_options(self, **options: Any) -> None: ...
     def collect(self) -> Dict[str, List[str]]: ...
-    def handle(self, **options: Any) -> Optional[str]: ...
     def log(self, msg: str, level: int = ...) -> None: ...
     def is_local_storage(self) -> bool: ...
     def clear_dir(self, path: str) -> None: ...

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

@@ -1,12 +1,3 @@
-from typing import Any, Optional
+from django.core.management.base import LabelCommand
 
-from django.core.management.base import CommandParser, LabelCommand
-
-class Command(LabelCommand):
-    stderr: django.core.management.base.OutputWrapper
-    stdout: django.core.management.base.OutputWrapper
-    style: django.core.management.color.Style
-    help: str = ...
-    label: str = ...
-    def add_arguments(self, parser: CommandParser) -> None: ...
-    def handle_label(self, path: str, **options: Any) -> str: ...
+class Command(LabelCommand): ...

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

@@ -1,13 +1,3 @@
-from typing import Any, Optional
+from django.core.management.commands.runserver import Command as RunserverCommand  # type: ignore
 
-from django.contrib.staticfiles.handlers import StaticFilesHandler
-from django.core.management.base import CommandParser
-from django.core.management.commands.runserver import Command as RunserverCommand
-
-class Command(RunserverCommand):
-    stderr: django.core.management.base.OutputWrapper
-    stdout: django.core.management.base.OutputWrapper
-    style: django.core.management.color.Style
-    help: str = ...
-    def add_arguments(self, parser: CommandParser) -> None: ...
-    def get_handler(self, *args: Any, **options: Any) -> StaticFilesHandler: ...
+class Command(RunserverCommand): ...

django-stubs/contrib/staticfiles/storage.pyi

@@ -20,7 +20,6 @@ class HashedFilesMixin:
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def file_hash(self, name: str, content: File = ...) -> str: ...
     def hashed_name(self, name: str, content: Optional[File] = ..., filename: Optional[str] = ...) -> str: ...
-    def url(self, name: SafeText, force: bool = ...) -> str: ...
     def url_converter(self, name: str, hashed_files: OrderedDict, template: str = ...) -> Callable: ...
     def post_process(
         self, paths: OrderedDict, dry_run: bool = ..., **options: Any
@@ -33,16 +32,13 @@ class ManifestFilesMixin(HashedFilesMixin):
     manifest_version: str = ...
     manifest_name: str = ...
     manifest_strict: bool = ...
-    hashed_files: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def read_manifest(self) -> Any: ...
     def load_manifest(self) -> OrderedDict: ...
-    def post_process(self, *args: Any, **kwargs: Any) -> None: ...
     def save_manifest(self) -> None: ...
-    def stored_name(self, name: str) -> str: ...
 
 class _MappingCache:
-    cache: django.core.cache.DefaultCacheProxy = ...
+    cache: Any = ...
     def __init__(self, cache: Any) -> None: ...
     def __setitem__(self, key: Any, value: Any) -> None: ...
     def __getitem__(self, key: Any): ...
@@ -51,9 +47,7 @@ class _MappingCache:
     def get(self, key: Any, default: Optional[Any] = ...): ...
 
 class CachedFilesMixin(HashedFilesMixin):
-    hashed_files: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    def hash_key(self, name: str) -> str: ...
 
 class CachedStaticFilesStorage(CachedFilesMixin, StaticFilesStorage): ...
 class ManifestStaticFilesStorage(ManifestFilesMixin, StaticFilesStorage): ...

django-stubs/contrib/staticfiles/urls.pyi

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

django-stubs/contrib/syndication/views.pyi

@@ -23,5 +23,5 @@ class Feed:
     def feed_extra_kwargs(self, obj: None) -> Dict[Any, Any]: ...
     def item_extra_kwargs(self, item: Model) -> Dict[Any, Any]: ...
     def get_object(self, request: WSGIRequest, *args: Any, **kwargs: Any) -> None: ...
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Model]: ...
+    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: ...
     def get_feed(self, obj: None, request: WSGIRequest) -> SyndicationFeed: ...

django-stubs/core/cache/__init__.pyi

@@ -1,7 +1,11 @@
 from collections import OrderedDict
 from typing import Any, Callable, Dict, Union
 
-from django.core.cache.backends.base import BaseCache as BaseCache
+from .backends.base import (
+    BaseCache as BaseCache,
+    CacheKeyWarning as CacheKeyWarning,
+    InvalidCacheBackendError as InvalidCacheBackendError,
+)
 
 DEFAULT_CACHE_ALIAS: str
 

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

@@ -1,5 +1,4 @@
-from collections import OrderedDict
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Union
 
 from django.core.exceptions import ImproperlyConfigured
 
@@ -9,7 +8,7 @@ class CacheKeyWarning(RuntimeWarning): ...
 DEFAULT_TIMEOUT: Any
 MEMCACHE_MAX_KEY_LENGTH: int
 
-def default_key_func(key: Union[int, str], key_prefix: str, version: Union[int, str]) -> str: ...
+def default_key_func(key: Any, key_prefix: str, version: Any) -> str: ...
 def get_key_func(key_func: Optional[Union[Callable, str]]) -> Callable: ...
 
 class BaseCache:
@@ -17,9 +16,9 @@ class BaseCache:
     key_prefix: str = ...
     version: int = ...
     key_func: Callable = ...
-    def __init__(self, params: Dict[str, Optional[Union[Callable, Dict[str, int], int, str]]]) -> None: ...
+    def __init__(self, params: Dict[str, Any]) -> None: ...
     def get_backend_timeout(self, timeout: Any = ...) -> Optional[float]: ...
-    def make_key(self, key: Union[int, str], version: Optional[Union[int, str]] = ...) -> str: ...
+    def make_key(self, key: Any, version: Optional[Any] = ...) -> str: ...
     def add(self, key: Any, value: Any, timeout: Any = ..., version: Optional[Any] = ...) -> None: ...
     def get(self, key: Any, default: Optional[Any] = ..., version: Optional[Any] = ...) -> Any: ...
     def set(self, key: Any, value: Any, timeout: Any = ..., version: Optional[Any] = ...) -> None: ...
@@ -27,19 +26,14 @@ class BaseCache:
     def delete(self, key: Any, version: Optional[Any] = ...) -> None: ...
     def get_many(self, keys: List[str], version: Optional[int] = ...) -> Dict[str, Union[int, str]]: ...
     def get_or_set(
-        self, key: str, default: Optional[Union[Callable, int, str]], timeout: Any = ..., version: Optional[int] = ...
-    ) -> Optional[Union[int, str]]: ...
+        self, key: Any, default: Optional[Any], timeout: Any = ..., version: Optional[int] = ...
+    ) -> Optional[Any]: ...
     def has_key(self, key: Any, version: Optional[Any] = ...): ...
     def incr(self, key: str, delta: int = ..., version: Optional[int] = ...) -> int: ...
     def decr(self, key: str, delta: int = ..., version: Optional[int] = ...) -> int: ...
     def __contains__(self, key: str) -> bool: ...
-    def set_many(
-        self,
-        data: Union[Dict[str, bytes], Dict[str, int], Dict[str, str], OrderedDict],
-        timeout: Any = ...,
-        version: Optional[Union[int, str]] = ...,
-    ) -> List[Any]: ...
-    def delete_many(self, keys: Union[Dict[str, str], List[str]], version: None = ...) -> None: ...
+    def set_many(self, data: Dict[str, Any], timeout: Any = ..., version: Optional[Any] = ...) -> List[Any]: ...
+    def delete_many(self, keys: Iterable[Any], version: Optional[Any] = ...) -> None: ...
     def clear(self) -> None: ...
     def validate_key(self, key: str) -> None: ...
     def incr_version(self, key: str, delta: int = ..., version: Optional[int] = ...) -> int: ...

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

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, Optional, Union
+from typing import Any, Dict
 
 from django.core.cache.backends.base import BaseCache
 
@@ -16,24 +16,7 @@ class Options:
     def __init__(self, table: str) -> None: ...
 
 class BaseDatabaseCache(BaseCache):
-    default_timeout: int
-    key_func: Callable
-    key_prefix: str
-    version: int
     cache_model_class: Any = ...
-    def __init__(self, table: str, params: Dict[str, Union[Callable, Dict[str, int], int, str]]) -> None: ...
+    def __init__(self, table: str, params: Dict[str, Any]) -> None: ...
 
-class DatabaseCache(BaseDatabaseCache):
-    default_timeout: int
-    key_func: Callable
-    key_prefix: str
-    version: int
-    def get(self, key: str, default: Optional[Union[int, str]] = ..., version: Optional[int] = ...) -> Any: ...
-    def set(self, key: str, value: Any, timeout: Any = ..., version: Optional[int] = ...) -> None: ...
-    def add(
-        self, key: str, value: Union[Dict[str, int], bytes, int, str], timeout: Any = ..., version: Optional[int] = ...
-    ) -> bool: ...
-    def touch(self, key: str, timeout: Any = ..., version: None = ...) -> bool: ...
-    def delete(self, key: str, version: Optional[int] = ...) -> None: ...
-    def has_key(self, key: str, version: Optional[int] = ...) -> Any: ...
-    def clear(self) -> None: ...
+class DatabaseCache(BaseDatabaseCache): ...