fix annotation for BaseCommand.handle() (#201)

* do not crash if model from same app refd in ForeignKey cannot be resolved

* bump to 1.2.0

.travis.yml

@@ -6,9 +6,7 @@ jobs:
   include:
     - name: Run plugin test suite with python 3.7
       python: 3.7
-      script: |
-        set -e
-        pytest
+      script: 'pytest'
 
     - name: Typecheck Django test suite with python 3.7
       python: 3.7
@@ -24,18 +22,23 @@ jobs:
 
     - name: Lint with black
       python: 3.7
-      script: 'black --check --line-length=120 django-stubs/'
+      script: 'black --check django-stubs/'
 
     - name: Lint plugin code with flake8
       python: 3.7
       script: 'flake8'
 
+    - name: Lint stubs with flake8-pyi and check for unused imports
+      python: 3.7
+      script: 'flake8 --config flake8-pyi.ini'
+
     - name: Lint plugin code with isort
       python: 3.7
-      script: 'isort --check'
+      script: 'isort --check --diff'
 
 before_install: |
-  # Upgrade pip, setuptools, and wheel
+  sudo apt update
+  sudo apt install binutils libproj-dev gdal-bin
   pip install -U pip setuptools wheel
 install: |
-  pip install -r ./dev-requirements.txt
+  pip install -r ./dev-requirements.txt

README.md

@@ -4,68 +4,81 @@
 
 [![Build Status](https://travis-ci.org/typeddjango/django-stubs.svg?branch=master)](https://travis-ci.org/typeddjango/django-stubs)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
+[![Gitter](https://badges.gitter.im/mypy-django/Lobby.svg)](https://gitter.im/mypy-django/Lobby)
 
 This package contains type stubs and mypy plugin to provide more precise static types and type inference for Django framework. Django uses some Python "magic" that makes having precise types for some code patterns problematic. This is why we need to accompany the stubs with mypy plugins. The final goal is to be able to get precise types for most common patterns.
 
-Supports Python 3.6/3.7, and Django 2.1/2.2.
-
 Could be run on earlier versions of Django, but expect some missing imports warnings.
 
+
 ## Installation
 
-```
+```bash
 pip install django-stubs
 ```
 
-### WARNING: All configuration from pre-1.0.0 versions is dropped, use one below.
 
-### WARNING: 1.0.0 breaks `dmypy`, if you need it, stay on the 0.12.x series. 
+## Mypy compatibility
+
+| django-stubs | mypy version | django version | python version
+| ------------ | ---- | ---- | ---- |
+| 1.2.0 | 0.730 | 2.2.x | ^3.6
+| 1.1.0 | 0.720 | 2.2.x | ^3.6
+| 0.12.x | old semantic analyzer (<0.711), dmypy support | 2.1.x | ^3.6
+
+
+## Configuration
 
 To make mypy aware of the plugin, you need to add
 
-```
+```ini
 [mypy]
 plugins =
     mypy_django_plugin.main
 ```
 
-in your `mypy.ini` file.
+in your `mypy.ini` or `setup.cfg` [file](https://mypy.readthedocs.io/en/latest/config_file.html).
 
-Plugin requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified inside `mypy.ini` file.
-```
+Plugin also requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified.
+
+```ini
 [mypy]
 strict_optional = True
 
-; this one is new
+# 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}
-```
+Where `mysettings` is a value of `DJANGO_SETTINGS_MODULE` (with or without quotes)
 
-New implementation uses Django runtime to extract models information, so it will crash, if your installed apps `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
+Current implementation uses Django runtime to extract models information, so it will crash, if your installed apps `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
 
 In other words, if your `manage.py runserver` crashes, mypy will crash too. 
 
+This fully working [typed boilerplate](https://github.com/wemake-services/wemake-django-template) can serve you as an example.
+
+
 ## 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
-```
+Type implementation monkey-patches Django to add `__class_getitem__` to the `Manager` class. 
+If you would use Python3.7 and do that too in your code, you can make things like
+
+```python
 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.
+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.

dev-requirements.txt

@@ -1,6 +1,7 @@
 black
-pytest-mypy-plugins==1.0.3
+pytest-mypy-plugins==1.1.0
 psycopg2
-flake8
-isort==4.3.4
+flake8==3.7.8
+flake8-pyi==19.3.0
+isort==4.3.21
 -e .

django-stubs/apps/registry.pyi

@@ -1,6 +1,6 @@
 import threading
 from collections import OrderedDict
-from typing import Any, Callable, List, Optional, Tuple, Type, Union, Iterable, DefaultDict, Dict
+from typing import Any, Callable, DefaultDict, Dict, Iterable, List, Optional, Tuple, Type, Union
 
 from django.db.migrations.state import AppConfigStub
 from django.db.models.base import Model
@@ -8,8 +8,8 @@ from django.db.models.base import Model
 from .config import AppConfig
 
 class Apps:
-    all_models: "Dict[str, OrderedDict[str, Type[Model]]]" = ...
-    app_configs: "OrderedDict[str, AppConfig]" = ...
+    all_models: Dict[str, OrderedDict[str, Type[Model]]] = ...
+    app_configs: OrderedDict[str, AppConfig] = ...
     stored_app_configs: List[Any] = ...
     apps_ready: bool = ...
     ready_event: threading.Event = ...

django-stubs/contrib/admin/checks.pyi

@@ -1,6 +1,6 @@
 from typing import Any, List, Union
 
-from django.contrib.admin.options import BaseModelAdmin, InlineModelAdmin, ModelAdmin
+from django.contrib.admin.options import BaseModelAdmin
 from django.core.checks.messages import Error
 
 _CheckError = Union[str, Error]

django-stubs/contrib/admin/decorators.pyi

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

django-stubs/contrib/admin/helpers.pyi

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

django-stubs/contrib/admin/options.pyi

@@ -56,7 +56,6 @@ class BaseModelAdmin:
     show_full_result_count: bool = ...
     checks_class: Any = ...
     def check(self, **kwargs: Any) -> List[Union[str, Error]]: ...
-    def __init__(self) -> None: ...
     def formfield_for_dbfield(
         self, db_field: Field, request: Optional[HttpRequest], **kwargs: Any
     ) -> Optional[Field]: ...
@@ -94,7 +93,6 @@ class BaseModelAdmin:
     def has_module_permission(self, request: HttpRequest) -> bool: ...
 
 class ModelAdmin(BaseModelAdmin):
-    formfield_overrides: Any
     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]]]] = ...
@@ -122,7 +120,6 @@ class ModelAdmin(BaseModelAdmin):
     actions_on_top: bool = ...
     actions_on_bottom: bool = ...
     actions_selection_counter: bool = ...
-    checks_class: Any = ...
     model: Type[Model] = ...
     opts: Options = ...
     admin_site: AdminSite = ...

django-stubs/contrib/admin/sites.pyi

@@ -1,11 +1,11 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
 
 from django.contrib.admin.options import ModelAdmin
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.http.response import HttpResponse
 from django.template.response import TemplateResponse
-from django.urls.resolvers import URLPattern, URLResolver
+from django.urls.resolvers import URLResolver
 from django.utils.functional import LazyObject
 
 all_sites: Any
@@ -31,11 +31,11 @@ class AdminSite:
     def check(self, app_configs: None) -> List[Any]: ...
     def register(
         self,
-        model_or_iterable: Union[List[Type[Model]], Tuple[Type[Model]], Type[Model]],
+        model_or_iterable: Union[Type[Model], Iterable[Type[Model]]],
         admin_class: Optional[Type[ModelAdmin]] = ...,
         **options: Any
     ) -> None: ...
-    def unregister(self, model_or_iterable: Type[Model]) -> None: ...
+    def unregister(self, model_or_iterable: Union[Type[Model], Iterable[Type[Model]]]) -> None: ...
     def is_registered(self, model: Type[Model]) -> bool: ...
     def add_action(self, action: Callable, name: None = ...) -> None: ...
     def disable_action(self, name: str) -> None: ...

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

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

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

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

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

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

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

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

django-stubs/contrib/admindocs/views.pyi

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

django-stubs/contrib/auth/base_user.pyi

@@ -13,14 +13,12 @@ class BaseUserManager(models.Manager[_T]):
     def get_by_natural_key(self, username: Optional[str]) -> _T: ...
 
 class AbstractBaseUser(models.Model):
-    password: models.CharField = ...
-    last_login: models.DateTimeField = ...
-    is_active: models.BooleanField = ...
+    password = models.CharField(max_length=128)
+    last_login = models.DateTimeField(blank=True, null=True)
+
     REQUIRED_FIELDS: List[str] = ...
     class Meta: ...
     def get_username(self) -> str: ...
-    def clean(self) -> None: ...
-    def save(self, *args: Any, **kwargs: Any) -> None: ...
     def natural_key(self) -> Tuple[str]: ...
     @property
     def is_anonymous(self) -> bool: ...

django-stubs/contrib/auth/decorators.pyi

@@ -1,6 +1,6 @@
-from typing import Any, Callable, List, Optional, Set, Union
+from typing import Callable, List, Optional, Set, Union
 
-from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME
+from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME  # noqa: F401
 
 def user_passes_test(
     test_func: Callable, login_url: Optional[str] = ..., redirect_field_name: str = ...

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

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

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

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

django-stubs/contrib/auth/mixins.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Optional
+from typing import Any, Callable, List
 
 from django import http
 from django.http.response import HttpResponse, HttpResponseRedirect

django-stubs/contrib/auth/models.pyi

@@ -15,17 +15,17 @@ class PermissionManager(models.Manager):
 
 class Permission(models.Model):
     content_type_id: int
-    name: models.CharField = ...
-    content_type: models.ForeignKey = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    codename: models.CharField = ...
+    name = models.CharField(max_length=255)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    codename = models.CharField(max_length=100)
     def natural_key(self) -> Tuple[str, str, str]: ...
 
 class GroupManager(models.Manager):
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
-    name: models.CharField = ...
-    permissions: models.ManyToManyField = models.ManyToManyField(Permission)
+    name = models.CharField(max_length=150)
+    permissions = models.ManyToManyField(Permission)
     def natural_key(self): ...
 
 _T = TypeVar("_T", bound=Model)
@@ -39,7 +39,7 @@ class UserManager(BaseUserManager[_T]):
     ) -> _T: ...
 
 class PermissionsMixin(models.Model):
-    is_superuser: models.BooleanField = ...
+    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]: ...
@@ -50,15 +50,17 @@ class PermissionsMixin(models.Model):
 
 class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
     username_validator: UnicodeUsernameValidator = ...
-    username: models.CharField = ...
-    first_name: models.CharField = ...
-    last_name: models.CharField = ...
-    email: models.EmailField = ...
-    is_staff: models.BooleanField = ...
-    date_joined: models.DateTimeField = ...
+
+    username = models.CharField(max_length=150)
+    first_name = models.CharField(max_length=30, blank=True)
+    last_name = models.CharField(max_length=150, blank=True)
+    email = models.EmailField(blank=True)
+    is_staff = models.BooleanField()
+    is_active = models.BooleanField()
+    date_joined = models.DateTimeField()
+
     EMAIL_FIELD: str = ...
     USERNAME_FIELD: str = ...
-    def clean(self) -> None: ...
     def get_full_name(self) -> str: ...
     def get_short_name(self) -> str: ...
     def email_user(self, subject: str, message: str, from_email: str = ..., **kwargs: Any) -> None: ...

django-stubs/contrib/auth/password_validation.pyi

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

django-stubs/contrib/contenttypes/checks.pyi

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

django-stubs/contrib/contenttypes/fields.pyi

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

django-stubs/contrib/contenttypes/views.pyi

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

django-stubs/contrib/flatpages/views.pyi

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

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

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

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

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

django-stubs/contrib/messages/context_processors.pyi

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

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

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

django-stubs/contrib/messages/utils.pyi

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

django-stubs/contrib/messages/views.pyi

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

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

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

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

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

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

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

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

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

django-stubs/contrib/postgres/indexes.pyi

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

django-stubs/contrib/postgres/lookups.pyi

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

django-stubs/contrib/postgres/search.pyi

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

django-stubs/contrib/staticfiles/checks.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.core.checks.messages import Error
 

django-stubs/contrib/staticfiles/storage.pyi

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

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

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

django-stubs/contrib/staticfiles/testing.pyi

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

django-stubs/contrib/staticfiles/utils.pyi

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

django-stubs/contrib/staticfiles/views.pyi

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

django-stubs/contrib/syndication/views.pyi

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

django-stubs/core/checks/caches.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.core.checks.messages import Error
 

django-stubs/core/checks/database.pyi

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

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

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.core.checks.messages import Warning
 

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

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.core.checks.messages import Warning
 

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

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.core.checks.messages import Warning
 

django-stubs/core/checks/templates.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.core.checks.messages import Error
 

django-stubs/core/checks/urls.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Optional, Tuple, Union
+from typing import Any, Callable, List, Tuple, Union
 
 from django.core.checks.messages import CheckMessage, Error, Warning
 from django.urls.resolvers import URLPattern, URLResolver

django-stubs/core/files/base.pyi

@@ -14,6 +14,7 @@ class File(FileProxyMixin, IO[Any]):
     def __init__(self, file: Any, name: Optional[str] = ...) -> None: ...
     def __bool__(self) -> bool: ...
     def __len__(self) -> int: ...
+    @property
     def size(self) -> int: ...
     def chunks(self, chunk_size: Optional[int] = ...) -> Iterator[bytes]: ...
     def multiple_chunks(self, chunk_size: Optional[int] = ...) -> bool: ...

django-stubs/core/files/uploadhandler.pyi

@@ -8,8 +8,8 @@ from django.utils.datastructures import MultiValueDict
 class UploadFileException(Exception): ...
 
 class StopUpload(UploadFileException):
-    connection_reset = ...  # type: bool
-    def __init__(self, connection_reset: bool = False) -> None: ...
+    connection_reset: bool = ...
+    def __init__(self, connection_reset: bool = ...) -> None: ...
 
 class SkipFile(UploadFileException): ...
 class StopFutureHandlers(UploadFileException): ...

django-stubs/core/management/base.pyi

@@ -63,7 +63,7 @@ class BaseCommand:
         fail_level: int = ...,
     ) -> None: ...
     def check_migrations(self) -> None: ...
-    def handle(self, *args: Any, **options: Any) -> None: ...
+    def handle(self, *args: Any, **options: Any) -> Optional[str]: ...
 
 class AppCommand(BaseCommand):
     missing_args_message: str = ...

django-stubs/core/management/color.pyi

@@ -1,5 +1,3 @@
-from collections import Callable
-
 def supports_color() -> bool: ...
 
 class Style:

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

@@ -1,13 +1,6 @@
-import os
-import re
-from typing import Any, Pattern, Type, Optional
+from typing import Any, Optional, Pattern, Type
 
 from django.core.management.base import BaseCommand
-from django.utils.functional import cached_property
-from django.utils.jslex import prepare_js_for_gettext
-
-from django.conf import settings
-from django.utils.translation import templatize
 
 plural_forms_re: Pattern = ...
 STATUS_OK: int = ...

django-stubs/core/paginator.pyi

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Union, Iterable, Sequence, Protocol, Any
+from typing import Dict, List, Optional, Protocol, Sequence, Union
 
 from django.db.models.base import Model
 from django.db.models.query import QuerySet
@@ -32,7 +32,9 @@ class Paginator:
     def validate_number(self, number: Optional[Union[float, str]]) -> int: ...
     def get_page(self, number: Optional[int]) -> Page: ...
     def page(self, number: Union[int, str]) -> Page: ...
+    @property
     def count(self) -> int: ...
+    @property
     def num_pages(self) -> int: ...
     @property
     def page_range(self) -> range: ...

django-stubs/core/servers/basehttp.pyi

@@ -4,7 +4,7 @@ from typing import Any, Dict
 from wsgiref import simple_server
 
 from django.core.handlers.wsgi import WSGIRequest, WSGIHandler
-from django.core.wsgi import get_wsgi_application as get_wsgi_application
+from django.core.wsgi import get_wsgi_application as get_wsgi_application  # noqa: F401
 
 class WSGIServer(simple_server.WSGIServer):
     request_queue_size: int = ...

django-stubs/core/signing.pyi

@@ -1,7 +1,5 @@
-from datetime import datetime, timedelta
-from typing import Any, Dict, List, Optional, Type, Union, Protocol
-
-from django.contrib.sessions.serializers import PickleSerializer
+from datetime import timedelta
+from typing import Any, Dict, Optional, Protocol, Type, Union
 
 class BadSignature(Exception): ...
 class SignatureExpired(BadSignature): ...

django-stubs/core/validators.pyi

@@ -5,7 +5,7 @@ from typing import Any, Dict, List, Optional, Union, Pattern, Collection
 from uuid import UUID
 
 from django.core.files.base import File
-from django.core.exceptions import ValidationError as ValidationError
+from django.core.exceptions import ValidationError as ValidationError  # noqa: F401
 
 EMPTY_VALUES: Any
 

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

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 

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

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 

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

@@ -1,17 +1,18 @@
 from datetime import date, datetime, timedelta
 from decimal import Decimal
-from typing import Any, List, Optional, Set, Tuple, Type, Union, Sequence
+from typing import Any, List, Optional, Sequence, Tuple, Type, Union
 
 from django.core.management.color import Style
-from django.db import DefaultConnectionProxy
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.backends.sqlite3.base import DatabaseWrapper
 from django.db.backends.utils import CursorWrapper
 from django.db.models.base import Model
 from django.db.models.expressions import Case, Expression
-from django.db.models.fields import Field
 from django.db.models.sql.compiler import SQLCompiler
 
+from django.db import DefaultConnectionProxy
+from django.db.models.fields import Field
+
 class BaseDatabaseOperations:
     compiler_module: str = ...
     integer_field_ranges: Any = ...

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

@@ -1,6 +1,7 @@
-from typing import Any, List, Optional
+from typing import Any, List
 
 from django.db.backends.base.base import BaseDatabaseWrapper
+
 from django.db.models.fields import Field
 
 class BaseDatabaseValidation:

django-stubs/db/backends/mysql/client.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 
 from django.db.backends.base.client import BaseDatabaseClient
 

django-stubs/db/backends/postgresql/client.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Dict
 
 from django.db.backends.base.client import BaseDatabaseClient
 

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

@@ -1,6 +1,5 @@
 from sqlite3 import dbapi2 as Database
-from sqlite3 import dbapi2 as Database
-from typing import Any, Callable, Iterator
+from typing import Any, Callable
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 

django-stubs/db/backends/utils.pyi

@@ -1,7 +1,7 @@
 import types
 from datetime import date, datetime, time
 from decimal import Decimal
-from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Tuple, Union, Type
+from typing import Any, Dict, List, Mapping, Optional, Sequence, Tuple, Type, Union
 from uuid import UUID
 
 logger: Any

django-stubs/db/migrations/exceptions.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Tuple
+from typing import Optional, Tuple
 
 from django.db.migrations.migration import Migration
 from django.db.utils import DatabaseError

django-stubs/db/migrations/graph.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Optional, Tuple, Union, Set, Dict
+from typing import Any, Dict, List, Optional, Set, Tuple, Union
 
 from django.db.migrations.migration import Migration, SwappableTuple
 from django.db.migrations.state import ProjectState

django-stubs/db/migrations/migration.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Tuple, Type, List
+from typing import Any, List, Tuple
 
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations.state import ProjectState

django-stubs/db/migrations/utils.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Iterable, Union, Optional, List
+from typing import Any
 
 COMPILED_REGEX_TYPE: Any
 

django-stubs/db/models/aggregates.pyi

@@ -5,6 +5,7 @@ from django.db.models.expressions import Func
 class Aggregate(Func):
     filter_template: str = ...
     filter: Any = ...
+    allow_distinct: bool = ...
     def __init__(self, *expressions: Any, distinct: bool = ..., filter: Optional[Any] = ..., **extra: Any) -> None: ...
 
 class Avg(Aggregate): ...

django-stubs/db/models/base.pyi

@@ -1,9 +1,7 @@
-from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, TypeVar, Union, ClassVar, Type
-
-from django.db.models.manager import Manager
+from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, TypeVar, Union
 
 from django.core.checks.messages import CheckMessage
-
+from django.db.models.manager import Manager
 from django.db.models.options import Options
 
 _Self = TypeVar("_Self", bound="Model")

django-stubs/db/models/fields/__init__.pyi

@@ -43,6 +43,7 @@ _GT = TypeVar("_GT")
 class Field(RegisterLookupMixin, Generic[_ST, _GT]):
     _pyi_private_set_type: Any
     _pyi_private_get_type: Any
+    _pyi_lookup_exact_type: Any
 
     widget: Widget
     help_text: str
@@ -55,9 +56,11 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
     model: Type[Model]
     name: str
     verbose_name: str
+    description: str
     blank: bool = ...
     null: bool = ...
     editable: bool = ...
+    empty_strings_allowed: bool = ...
     choices: Optional[_FieldChoices] = ...
     db_column: Optional[str]
     column: str
@@ -129,6 +132,7 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
 class IntegerField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[float, int, str, Combinable]
     _pyi_private_get_type: int
+    _pyi_lookup_exact_type: int
 
 class PositiveIntegerRelDbTypeMixin:
     def rel_db_type(self, connection: Any): ...
@@ -141,10 +145,12 @@ class BigIntegerField(IntegerField[_ST, _GT]): ...
 class FloatField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[float, int, str, Combinable]
     _pyi_private_get_type: float
+    _pyi_lookup_exact_type: float
 
 class DecimalField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[str, float, decimal.Decimal, Combinable]
     _pyi_private_get_type: decimal.Decimal
+    _pyi_lookup_exact_type: Union[str, decimal.Decimal]
     # attributes
     max_digits: int = ...
     decimal_places: int = ...
@@ -174,10 +180,13 @@ class DecimalField(Field[_ST, _GT]):
 class AutoField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[Combinable, int, str]
     _pyi_private_get_type: int
+    _pyi_lookup_exact_type: int
 
 class CharField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[str, int, Combinable]
     _pyi_private_get_type: str
+    # objects are converted to string before comparison
+    _pyi_lookup_exact_type: Any
     def __init__(
         self,
         verbose_name: Optional[Union[str, bytes]] = ...,
@@ -236,14 +245,18 @@ class URLField(CharField[_ST, _GT]): ...
 class TextField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[str, Combinable]
     _pyi_private_get_type: str
+    # objects are converted to string before comparison
+    _pyi_lookup_exact_type: Any
 
 class BooleanField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[bool, Combinable]
     _pyi_private_get_type: bool
+    _pyi_lookup_exact_type: bool
 
 class NullBooleanField(Field[_ST, _GT]):
     _pyi_private_set_type: Optional[Union[bool, Combinable]]
     _pyi_private_get_type: Optional[bool]
+    _pyi_lookup_exact_type: Optional[bool]
 
 class IPAddressField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[str, Combinable]
@@ -284,6 +297,7 @@ class DateTimeCheckMixin: ...
 class DateField(DateTimeCheckMixin, Field[_ST, _GT]):
     _pyi_private_set_type: Union[str, date, Combinable]
     _pyi_private_get_type: date
+    _pyi_lookup_exact_type: Union[str, date]
     def __init__(
         self,
         verbose_name: Optional[Union[str, bytes]] = ...,
@@ -336,6 +350,7 @@ class TimeField(DateTimeCheckMixin, Field[_ST, _GT]):
 
 class DateTimeField(DateField[_ST, _GT]):
     _pyi_private_get_type: datetime
+    _pyi_lookup_exact_type: Union[str, datetime]
 
 class UUIDField(Field[_ST, _GT]):
     _pyi_private_set_type: Union[str, uuid.UUID]

django-stubs/db/models/fields/files.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Optional, Type, Union, Tuple, Iterable, overload, TypeVar
+from typing import Any, Callable, Iterable, List, Optional, Tuple, Type, TypeVar, Union, overload
 
 from django.core.files.base import File
 from django.core.files.images import ImageFile
@@ -6,7 +6,6 @@ from django.core.files.storage import FileSystemStorage, Storage
 from django.db.models.base import Model
 
 from django.db.models.fields import Field, _FieldChoices, _ValidatorCallable, _ErrorMessagesToOverride
-from django.forms import fields as form_fields
 
 BLANK_CHOICE_DASH: List[Tuple[str, str]] = ...
 

django-stubs/db/models/fields/related.pyi

@@ -1,43 +1,27 @@
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Iterable,
-    List,
-    Optional,
-    Sequence,
-    TYPE_CHECKING,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    overload,
-)
+from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Type, TypeVar, Union, overload
 from uuid import UUID
 
+from django.db import models
+from django.db.models.base import Model
+from django.db.models.fields import Field
+from django.db.models.query_utils import Q, PathInfo
+from django.db.models.manager import RelatedManager
 from django.db.models.expressions import Combinable
 from django.db.models.fields.mixins import FieldCacheMixin
-from django.db.models.query_utils import PathInfo, Q
-
-from django.db import models
-from django.db.models import Field, Model
-from django.db.models.fields.related_descriptors import (
+from django.db.models.fields.related_descriptors import (  # noqa: F401
     ForwardOneToOneDescriptor as ForwardOneToOneDescriptor,
     ForwardManyToOneDescriptor as ForwardManyToOneDescriptor,
     ManyToManyDescriptor as ManyToManyDescriptor,
     ReverseOneToOneDescriptor as ReverseOneToOneDescriptor,
     ReverseManyToOneDescriptor as ReverseManyToOneDescriptor,
 )
-from django.db.models.fields.reverse_related import (
+from django.db.models.fields.reverse_related import (  # noqa: F401
     ForeignObjectRel as ForeignObjectRel,
     OneToOneRel as OneToOneRel,
     ManyToOneRel as ManyToOneRel,
     ManyToManyRel as ManyToManyRel,
 )
 
-if TYPE_CHECKING:
-    from django.db.models.manager import RelatedManager
-
 _T = TypeVar("_T", bound=models.Model)
 _F = TypeVar("_F", bound=models.Field)
 _Choice = Tuple[Any, str]
@@ -114,7 +98,7 @@ class ForeignKey(ForeignObject[_ST, _GT]):
         to: Union[Type[Model], str],
         on_delete: Callable[..., None],
         to_field: Optional[str] = ...,
-        related_name: str = ...,
+        related_name: Optional[str] = ...,
         related_query_name: Optional[str] = ...,
         limit_choices_to: Optional[Union[Dict[str, Any], Callable[[], Any], Q]] = ...,
         parent_link: bool = ...,
@@ -159,7 +143,7 @@ class OneToOneField(RelatedField[_ST, _GT]):
         to: Union[Type[Model], str],
         on_delete: Any,
         to_field: Optional[str] = ...,
-        related_name: str = ...,
+        related_name: Optional[str] = ...,
         related_query_name: Optional[str] = ...,
         limit_choices_to: Optional[Union[Dict[str, Any], Callable[[], Any], Q]] = ...,
         parent_link: bool = ...,

django-stubs/db/models/fields/reverse_related.pyi

@@ -1,12 +1,12 @@
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.db.models.base import Model
-from django.db.models.fields import AutoField, Field
 from django.db.models.fields.related import ForeignKey, OneToOneField, RelatedField
 from django.db.models.lookups import BuiltinLookup, StartsWith
-from django.db.models.query_utils import FilteredRelation, PathInfo, Q
+from django.db.models.query_utils import FilteredRelation, PathInfo
 from django.db.models.sql.where import WhereNode
 
+from django.db.models.fields import AutoField, Field
 from .mixins import FieldCacheMixin
 
 class ForeignObjectRel(FieldCacheMixin):

django-stubs/db/models/lookups.pyi

@@ -1,18 +1,18 @@
-from collections import OrderedDict
 from datetime import datetime
-from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union, Mapping
+from typing import Any, Iterable, List, Optional, Tuple, Type, Union, Mapping, TypeVar, Generic
 
 from django.db.backends.sqlite3.base import DatabaseWrapper
-from django.db.models.expressions import Combinable, Expression, Func
+from django.db.models.expressions import Expression, Func
 from django.db.models.query_utils import RegisterLookupMixin
 from django.db.models.sql.compiler import SQLCompiler
-from django.db.models.sql.query import Query
 from django.utils.datastructures import OrderedSet
 from django.utils.safestring import SafeText
 
 from django.db.models.fields import TextField, related_lookups
 
-class Lookup:
+_T = TypeVar("_T")
+
+class Lookup(Generic[_T]):
     lookup_name: str = ...
     prepare_rhs: bool = ...
     can_use_none_as_rhs: bool = ...
@@ -49,7 +49,7 @@ class Transform(RegisterLookupMixin, Func):
     def lhs(self) -> Expression: ...
     def get_bilateral_transforms(self) -> List[Type[Transform]]: ...
 
-class BuiltinLookup(Lookup):
+class BuiltinLookup(Lookup[_T]):
     def get_rhs_op(self, connection: DatabaseWrapper, rhs: str) -> str: ...
 
 class FieldGetDbPrepValueMixin:
@@ -64,21 +64,21 @@ class FieldGetDbPrepValueIterableMixin(FieldGetDbPrepValueMixin):
 class Exact(FieldGetDbPrepValueMixin, BuiltinLookup): ...
 class IExact(BuiltinLookup): ...
 class GreaterThan(FieldGetDbPrepValueMixin, BuiltinLookup): ...
-class GreaterThanOrEqual(FieldGetDbPrepValueMixin, BuiltinLookup): ...
-class LessThan(FieldGetDbPrepValueMixin, BuiltinLookup): ...
+class GreaterThanOrEqual(FieldGetDbPrepValueMixin, BuiltinLookup[_T]): ...
+class LessThan(FieldGetDbPrepValueMixin, BuiltinLookup[_T]): ...
 class LessThanOrEqual(FieldGetDbPrepValueMixin, BuiltinLookup): ...
 
 class IntegerFieldFloatRounding:
     rhs: Any = ...
     def get_prep_lookup(self) -> Any: ...
 
-class IntegerGreaterThanOrEqual(IntegerFieldFloatRounding, GreaterThanOrEqual): ...
-class IntegerLessThan(IntegerFieldFloatRounding, LessThan): ...
+class IntegerGreaterThanOrEqual(IntegerFieldFloatRounding, GreaterThanOrEqual[Union[int, float]]): ...
+class IntegerLessThan(IntegerFieldFloatRounding, LessThan[Union[int, float]]): ...
 
 class In(FieldGetDbPrepValueIterableMixin, BuiltinLookup):
     def split_parameter_list_as_sql(self, compiler: Any, connection: Any): ...
 
-class PatternLookup(BuiltinLookup):
+class PatternLookup(BuiltinLookup[str]):
     param_pattern: str = ...
 
 class Contains(PatternLookup): ...
@@ -88,8 +88,8 @@ class IStartsWith(StartsWith): ...
 class EndsWith(PatternLookup): ...
 class IEndsWith(EndsWith): ...
 class Range(FieldGetDbPrepValueIterableMixin, BuiltinLookup): ...
-class IsNull(BuiltinLookup): ...
-class Regex(BuiltinLookup): ...
+class IsNull(BuiltinLookup[bool]): ...
+class Regex(BuiltinLookup[str]): ...
 class IRegex(Regex): ...
 
 class YearLookup(Lookup):

django-stubs/db/models/options.pyi

@@ -1,5 +1,5 @@
 import collections
-from typing import Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type, Union, TypeVar, Generic, Sequence
+from typing import Any, Callable, Dict, Generic, Iterator, List, Optional, Sequence, Set, Tuple, Type, TypeVar, Union
 
 from django.apps.config import AppConfig
 from django.apps.registry import Apps
@@ -9,13 +9,13 @@ from django.contrib.postgres.fields.citext import CIText
 from django.db.backends.sqlite3.base import DatabaseWrapper
 from django.db.models.base import Model
 from django.db.models.fields.mixins import FieldCacheMixin
-from django.db.models.fields.related import OneToOneField, ManyToManyField
+from django.db.models.fields.related import ManyToManyField, OneToOneField
 from django.db.models.fields.reverse_related import ForeignObjectRel
 from django.db.models.manager import Manager
 from django.db.models.query_utils import PathInfo
 from django.utils.datastructures import ImmutableList
 
-from django.db.models.fields import Field, mixins, AutoField
+from django.db.models.fields import AutoField, Field
 
 PROXY_PARENTS: Any
 EMPTY_RELATION_TREE: Any
@@ -51,7 +51,7 @@ class Options(Generic[_M]):
     verbose_name: Optional[str] = ...
     verbose_name_plural: Optional[str] = ...
     db_table: str = ...
-    ordering: Optional[List[str]] = ...
+    ordering: Optional[Sequence[str]] = ...
     indexes: List[Any] = ...
     unique_together: Union[List[Any], Tuple] = ...
     index_together: Union[List[Any], Tuple] = ...
@@ -97,7 +97,7 @@ class Options(Generic[_M]):
     def setup_proxy(self, target: Type[Model]) -> None: ...
     def can_migrate(self, connection: Union[DatabaseWrapper, str]) -> bool: ...
     @property
-    def verbose_name_raw(self) -> Any: ...
+    def verbose_name_raw(self) -> str: ...
     @property
     def swapped(self) -> Optional[str]: ...
     @property

django-stubs/db/models/query.pyi

@@ -1,7 +1,9 @@
 import datetime
 from typing import (
     Any,
+    Collection,
     Dict,
+    Generic,
     Iterable,
     Iterator,
     List,
@@ -14,18 +16,15 @@ from typing import (
     TypeVar,
     Union,
     overload,
-    Generic,
-    NamedTuple,
-    Collection,
 )
 
 from django.db.models.base import Model
-from django.db.models.expressions import Combinable as Combinable, F as F
+from django.db.models.expressions import Combinable as Combinable, F as F  # noqa: F401
 from django.db.models.sql.query import Query, RawQuery
 
 from django.db import models
 from django.db.models import Manager
-from django.db.models.query_utils import Q as Q
+from django.db.models.query_utils import Q as Q  # noqa: F401
 
 _T = TypeVar("_T", bound=models.Model, covariant=True)
 _QS = TypeVar("_QS", bound="_BaseQuerySet")
@@ -43,8 +42,7 @@ class _BaseQuerySet(Generic[_T], Sized):
     def as_manager(cls) -> Manager[Any]: ...
     def __len__(self) -> int: ...
     def __bool__(self) -> bool: ...
-    def __class_getitem__(cls, item: Type[_T]):
-        pass
+    def __class_getitem__(cls, item: Type[_T]): ...
     def __getstate__(self) -> Dict[str, Any]: ...
     # Technically, the other QuerySet must be of the same type _T, but _T is covariant
     def __and__(self: _QS, other: _BaseQuerySet[_T]) -> _QS: ...

django-stubs/db/models/utils.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Tuple, Type, Union
+from typing import Tuple, Type, Union
 
 from django.db.models.base import Model
 

django-stubs/db/transaction.pyi

@@ -38,5 +38,5 @@ def atomic(using: _C) -> _C: ...
 
 # Decorator or context-manager with parameters
 @overload
-def atomic(using: Optional[str] = ..., savepoint: bool = True) -> Atomic: ...
+def atomic(using: Optional[str] = ..., savepoint: bool = ...) -> Atomic: ...
 def non_atomic_requests(using: Callable = ...) -> Callable: ...

django-stubs/dispatch/dispatcher.pyi

@@ -1,7 +1,4 @@
-from typing import Any, Callable, List, Optional, Tuple, Type, Union
-
-from django.apps.config import AppConfig
-from django.db.models.base import Model
+from typing import Any, Callable, List, Optional, Tuple, Union
 
 NONE_ID: Any
 NO_RECEIVERS: Any

django-stubs/forms/fields.pyi

@@ -1,6 +1,5 @@
 from datetime import datetime, timedelta
-from decimal import Decimal
-from typing import Any, Callable, List, Optional, Pattern, Sequence, Type, Union, Tuple, Iterable
+from typing import Any, Callable, Iterable, List, Optional, Pattern, Sequence, Tuple, Type, Union
 
 from django.core.validators import BaseValidator
 from django.forms.boundfield import BoundField

django-stubs/forms/forms.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Type, Union, Tuple
+from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Type, Union
 
 from django.core.exceptions import ValidationError as ValidationError
 from django.forms.boundfield import BoundField
@@ -8,8 +8,7 @@ from django.forms.utils import ErrorDict, ErrorList
 from django.forms.widgets import Media, MediaDefiningClass
 from django.utils.safestring import SafeText
 
-class DeclarativeFieldsMetaclass(MediaDefiningClass):
-    def __new__(mcs, name: str, bases: Sequence[Type[BaseForm]], attrs: Dict[str, Any]) -> Type[BaseForm]: ...
+class DeclarativeFieldsMetaclass(MediaDefiningClass): ...
 
 class BaseForm:
     class Meta:

django-stubs/forms/models.pyi

@@ -54,8 +54,7 @@ class ModelFormOptions:
     field_classes: Optional[Dict[str, Type[Field]]] = ...
     def __init__(self, options: Optional[type] = ...) -> None: ...
 
-class ModelFormMetaclass(DeclarativeFieldsMetaclass):
-    def __new__(mcs, name: str, bases: Sequence[Type[Any]], attrs: Dict[str, Any]) -> Type[ModelForm]: ...
+class ModelFormMetaclass(DeclarativeFieldsMetaclass): ...
 
 class BaseModelForm(BaseForm):
     instance: Any = ...
@@ -73,7 +72,6 @@ class BaseModelForm(BaseForm):
         use_required_attribute: Optional[bool] = ...,
         renderer: Any = ...,
     ) -> None: ...
-    def clean(self) -> Dict[str, Any]: ...
     def validate_unique(self) -> None: ...
     save_m2m: Any = ...
     def save(self, commit: bool = ...) -> Any: ...

django-stubs/forms/renderers.pyi

@@ -1,7 +1,6 @@
 from typing import Any, Dict
 
 from django.template.backends.base import BaseEngine
-from django.template.engine import Engine
 
 from django.template import Template
 

django-stubs/forms/widgets.pyi

@@ -27,8 +27,7 @@ class Media:
     def merge(list_1: Iterable[Any], list_2: Iterable[Any]) -> Iterable[Any]: ...
     def __add__(self, other: Media) -> Media: ...
 
-class MediaDefiningClass(type):
-    def __new__(mcs, name: str, bases: Sequence[Any], attrs: Dict[str, Any]) -> type: ...
+class MediaDefiningClass(type): ...
 
 class Widget:
     needs_multipart_form: bool = ...
@@ -70,9 +69,7 @@ class HiddenInput(Input):
     choices: Iterable[Tuple[str, str]]
 
 class MultipleHiddenInput(HiddenInput): ...
-
-class FileInput(Input):
-    needs_multipart_form: bool = ...
+class FileInput(Input): ...
 
 class ClearableFileInput(FileInput):
     clear_checkbox_label: Any = ...
@@ -102,7 +99,7 @@ class ChoiceWidget(Widget):
     allow_multiple_selected: bool = ...
     input_type: Optional[str] = ...
     template_name: Optional[str] = ...
-    option_template_name: Any = ...
+    option_template_name: str = ...
     add_id_index: bool = ...
     checked_attribute: Any = ...
     option_inherits_attrs: bool = ...
@@ -130,10 +127,8 @@ class SelectMultiple(Select):
 
 class RadioSelect(ChoiceWidget):
     can_add_related: bool
-    option_template_name: str = ...
 
-class CheckboxSelectMultiple(ChoiceWidget):
-    def id_for_label(self, id_: str, index: Optional[str] = ...) -> str: ...
+class CheckboxSelectMultiple(ChoiceWidget): ...
 
 class MultiWidget(Widget):
     template_name: str = ...

django-stubs/http/request.pyi

@@ -10,17 +10,16 @@ from typing import (
     Pattern,
     Set,
     Tuple,
+    Type,
+    TypeVar,
     Union,
     overload,
-    TypeVar,
-    Type,
 )
 
+from django.contrib.auth.base_user import AbstractBaseUser
 from django.contrib.sessions.backends.base import SessionBase
-from django.db.models.base import Model
 from django.utils.datastructures import CaseInsensitiveMapping, ImmutableList, MultiValueDict
 
-from django.contrib.auth.base_user import AbstractBaseUser
 from django.core.files import uploadedfile, uploadhandler
 from django.urls import ResolverMatch
 

django-stubs/http/response.pyi

@@ -48,8 +48,8 @@ class HttpResponseBase(Iterable[Any]):
         samesite: str = ...,
     ) -> None: ...
     def setdefault(self, key: str, value: str) -> None: ...
-    def set_signed_cookie(self, key: str, value: str, salt: str = "", **kwargs: Any) -> None: ...
-    def delete_cookie(self, key: str, path: str = "", domain: Optional[str] = ...) -> None: ...
+    def set_signed_cookie(self, key: str, value: str, salt: str = ..., **kwargs: Any) -> None: ...
+    def delete_cookie(self, key: str, path: str = ..., domain: Optional[str] = ...) -> None: ...
     def make_bytes(self, value: object) -> bytes: ...
     def close(self) -> None: ...
     def write(self, content: Union[str, bytes]) -> None: ...

django-stubs/shortcuts.pyi

@@ -22,8 +22,7 @@ def render(
     using: Optional[str] = ...,
 ) -> HttpResponse: ...
 
-class SupportsGetAbsoluteUrl(Protocol):
-    pass
+class SupportsGetAbsoluteUrl(Protocol): ...
 
 def redirect(
     to: Union[Callable, str, SupportsGetAbsoluteUrl], *args: Any, permanent: bool = ..., **kwargs: Any

django-stubs/template/backends/utils.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.http.request import HttpRequest
 from django.utils.safestring import SafeText

django-stubs/template/defaultfilters.pyi

@@ -2,7 +2,7 @@ from datetime import date as _date, datetime, time as _time
 from typing import Any, Callable, Dict, List, Optional, Union
 
 from django.utils.safestring import SafeText
-from django.utils.html import escape as escape
+from django.utils.html import escape as escape  # noqa: F401
 
 register: Any
 

django-stubs/template/loader.pyi

@@ -1,8 +1,8 @@
 from typing import Any, Dict, List, Optional, Union
-from . import engines as engines
+from . import engines as engines  # noqa: F401
 
 from django.http.request import HttpRequest
-from django.template.exceptions import TemplateDoesNotExist as TemplateDoesNotExist
+from django.template.exceptions import TemplateDoesNotExist as TemplateDoesNotExist  # noqa: F401
 
 def get_template(template_name: str, using: Optional[str] = ...) -> Any: ...
 def select_template(template_name_list: Union[List[str], str], using: Optional[str] = ...) -> Any: ...

django-stubs/template/response.pyi

@@ -1,13 +1,12 @@
 import functools
 from http.cookies import SimpleCookie
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
 from django.template.base import Template
 from django.template.context import RequestContext
 from django.test.client import Client
-from django.utils.functional import SimpleLazyObject
 
 from django.http import HttpResponse
 
@@ -20,7 +19,7 @@ class SimpleTemplateResponse(HttpResponse):
     status_code: int
     rendering_attrs: Any = ...
     template_name: Union[List[str], Template, str] = ...
-    context_data: Optional[Dict[str, str]] = ...
+    context_data: Optional[Dict[str, Any]] = ...
     using: Optional[str] = ...
     def __init__(
         self,
@@ -31,7 +30,7 @@ class SimpleTemplateResponse(HttpResponse):
         charset: Optional[str] = ...,
         using: Optional[str] = ...,
     ) -> None: ...
-    def resolve_template(self, template: Union[List[str], Template, str]) -> Union[Template, Template]: ...
+    def resolve_template(self, template: Union[Sequence[str], Template, str]) -> Template: ...
     def resolve_context(self, context: Optional[Dict[str, Any]]) -> Optional[Dict[str, Any]]: ...
     @property
     def rendered_content(self) -> str: ...