django-types 0.19.1__tar.gz → 0.21.0__tar.gz

{django_types-0.19.1 → django_types-0.21.0}/PKG-INFO

@@ -1,20 +1,18 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: django-types
-Version: 0.19.1
+Version: 0.21.0
 Summary: Type stubs for Django
-Home-page: https://github.com/sbdchd/django-types
 License: MIT
 Keywords: django,types,mypy,stubs
 Author: Steve Dignam
 Author-email: steve@dignam.xyz
-Requires-Python: >=3.7,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: types-psycopg2 (>=2.9.21.13)
 Project-URL: Repository, https://github.com/sbdchd/django-types
 Description-Content-Type: text/markdown
@@ -38,12 +36,14 @@ Type stubs for [Django](https://www.djangoproject.com).
 pip install django-types
 ```
 
+### I cannot use QuerySet or Manager with type annotations
+
 You can get a `TypeError: 'type' object is not subscriptable`
 when you will try to use `QuerySet[MyModel]`, `Manager[MyModel]` or some other Django-based Generic types.
 
 This happens because these Django classes do not support [`__class_getitem__`](https://www.python.org/dev/peps/pep-0560/#class-getitem) magic method in runtime.
 
-1. You can go with [`django_stubs_ext`](https://github.com/typeddjango/django-stubs/tree/master/django_stubs_ext) helper, that patches all the types we use as Generic in django.
+1. You can go with [`django_stubs_ext`](https://github.com/typeddjango/django-stubs/tree/master/ext) helper, that patches all the types we use as Generic in django.
 
    Install it:
 
@@ -275,3 +275,7 @@ def activity(request: HttpRequest, team_id: str) -> HttpResponse:
 - <https://github.com/sbdchd/mongo-types>
 - <https://github.com/sbdchd/msgpack-types>
 
+## Releasing a new version
+1. Navigate to https://github.com/sbdchd/django-types/actions/workflows/bump_version.yml and click "Run workflow".
+2. Select the version level you wish to increase and click "Run workflow" to bump the version and publish to PyPI.
+

{django_types-0.19.1 → django_types-0.21.0}/README.md

@@ -17,12 +17,14 @@ Type stubs for [Django](https://www.djangoproject.com).
 pip install django-types
 ```
 
+### I cannot use QuerySet or Manager with type annotations
+
 You can get a `TypeError: 'type' object is not subscriptable`
 when you will try to use `QuerySet[MyModel]`, `Manager[MyModel]` or some other Django-based Generic types.
 
 This happens because these Django classes do not support [`__class_getitem__`](https://www.python.org/dev/peps/pep-0560/#class-getitem) magic method in runtime.
 
-1. You can go with [`django_stubs_ext`](https://github.com/typeddjango/django-stubs/tree/master/django_stubs_ext) helper, that patches all the types we use as Generic in django.
+1. You can go with [`django_stubs_ext`](https://github.com/typeddjango/django-stubs/tree/master/ext) helper, that patches all the types we use as Generic in django.
 
    Install it:
 
@@ -253,3 +255,7 @@ def activity(request: HttpRequest, team_id: str) -> HttpResponse:
 - <https://github.com/sbdchd/celery-types>
 - <https://github.com/sbdchd/mongo-types>
 - <https://github.com/sbdchd/msgpack-types>
+
+## Releasing a new version
+1. Navigate to https://github.com/sbdchd/django-types/actions/workflows/bump_version.yml and click "Run workflow".
+2. Select the version level you wish to increase and click "Run workflow" to bump the version and publish to PyPI.

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/__init__.pyi

@@ -6,6 +6,7 @@ from .filters import AllValuesFieldListFilter as AllValuesFieldListFilter
 from .filters import BooleanFieldListFilter as BooleanFieldListFilter
 from .filters import ChoicesFieldListFilter as ChoicesFieldListFilter
 from .filters import DateFieldListFilter as DateFieldListFilter
+from .filters import EmptyFieldListFilter as EmptyFieldListFilter
 from .filters import FieldListFilter as FieldListFilter
 from .filters import ListFilter as ListFilter
 from .filters import RelatedFieldListFilter as RelatedFieldListFilter

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/actions.pyi

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

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/decorators.pyi

@@ -8,6 +8,7 @@ from django.db.models.expressions import BaseExpression
 from django.http import HttpRequest, HttpResponse
 
 _M = TypeVar("_M", bound=Model)
+_T = TypeVar("_T", bound=object)
 
 def action(
     function: (
@@ -17,7 +18,7 @@ def action(
     *,
     permissions: Sequence[str] | None = ...,
     description: str | None = ...,
-) -> Callable[..., Any]: ...
+) -> Callable[[_T], _T]: ...
 def display(
     function: Callable[[_M], Any] | None = ...,
     *,
@@ -25,5 +26,5 @@ def display(
     ordering: str | Combinable | BaseExpression | None = ...,
     description: str | None = ...,
     empty_value: str | None = ...,
-) -> Callable[..., Any]: ...
-def register(*models: type[Model], site: Any | None = ...) -> Callable[..., Any]: ...
+) -> Callable[[_T], _T]: ...
+def register(*models: type[Model], site: Any | None = ...) -> Callable[[_T], _T]: ...

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/filters.pyi

@@ -2,11 +2,11 @@ from collections.abc import Callable, Iterator
 from typing import Any
 
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.fields import Field
 from django.db.models.fields.related import RelatedField
 from django.db.models.query import QuerySet
+from django.http.request import HttpRequest
 
 class ListFilter:
     title: Any = ...
@@ -14,7 +14,7 @@ class ListFilter:
     used_parameters: Any = ...
     def __init__(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         params: dict[str, str],
         model: type[Model],
         model_admin: ModelAdmin[Any],
@@ -39,7 +39,7 @@ class FieldListFilter(ListFilter):
     def __init__(
         self,
         field: Field[Any, Any],
-        request: WSGIRequest,
+        request: HttpRequest,
         params: dict[str, str],
         model: type[Model],
         model_admin: ModelAdmin[Any],
@@ -56,7 +56,7 @@ class FieldListFilter(ListFilter):
     def create(
         cls,
         field: Field[Any, Any],
-        request: WSGIRequest,
+        request: HttpRequest,
         params: dict[str, str],
         model: type[Model],
         model_admin: ModelAdmin[Any],
@@ -78,7 +78,7 @@ class RelatedFieldListFilter(FieldListFilter):
     def field_choices(
         self,
         field: RelatedField[Any, Any],
-        request: WSGIRequest,
+        request: HttpRequest,
         model_admin: ModelAdmin[Any],
     ) -> list[tuple[str, str]]: ...
 

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/models.pyi

@@ -1,10 +1,11 @@
-import datetime as dt
+from collections.abc import Iterable
 from typing import Any, ClassVar, TypeVar
 from typing_extensions import Self
-from uuid import UUID
 
+from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.utils import timezone as timezone
 
 ADDITION: int
 CHANGE: int
@@ -14,26 +15,37 @@ ACTION_FLAG_CHOICES: list[tuple[int, str]]
 _LogEntryT = TypeVar("_LogEntryT", bound=LogEntry)
 
 class LogEntryManager(models.Manager[_LogEntryT]):
+    use_in_migrations: bool
+    # Deprecated in favor of log_actions
     def log_action(
         self,
         user_id: int,
         content_type_id: int,
-        object_id: int | str | UUID,
+        object_id: Any,
         object_repr: str,
         action_flag: int,
         change_message: str | list[Any] = ...,
     ) -> _LogEntryT: ...
+    def log_actions(
+        self,
+        user_id: int,
+        queryset: Iterable[models.Model],
+        action_flag: int,
+        change_message: str | list[Any] = ...,
+        *,
+        single_object: bool = ...,
+    ) -> _LogEntryT | list[_LogEntryT]: ...
 
 class LogEntry(models.Model):
-    objects: ClassVar[LogEntryManager[Self]]  # type: ignore[assignment]
+    action_time = models.DateTimeField()
+    user = models.ForeignKey[User]
+    content_type = models.ForeignKey[ContentType]
+    object_id = models.TextField(blank=True, null=True)
+    object_repr = models.CharField()
+    action_flag = models.PositiveSmallIntegerField()
+    change_message = models.TextField(blank=True)
 
-    action_time: models.DateTimeField[dt.datetime]
-    user: models.ForeignKey[Any]
-    content_type: models.ForeignKey[ContentType | None]
-    object_id: models.TextField[str | None]
-    object_repr: models.CharField[str]
-    action_flag: models.PositiveSmallIntegerField[int]
-    change_message: models.TextField[str]
+    objects: ClassVar[LogEntryManager[Self]]  # type: ignore[assignment]
 
     def is_addition(self) -> bool: ...
     def is_change(self) -> bool: ...

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/options.pyi

@@ -1,9 +1,10 @@
 from collections import OrderedDict
-from collections.abc import Callable, Iterator, Mapping, Sequence
-from typing import Any, Generic, TypeVar
-from typing_extensions import Literal, TypedDict
+from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
+from typing import Any, Generic, Literal, TypeVar
+from typing_extensions import TypedDict
 
 from django.contrib.admin.filters import ListFilter
+from django.contrib.admin.helpers import ActionForm
 from django.contrib.admin.models import LogEntry
 from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.views.main import ChangeList
@@ -16,11 +17,14 @@ from django.db.models.fields import Field
 from django.db.models.fields.related import ForeignKey, ManyToManyField, RelatedField
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
+from django.forms.fields import Field as FormField
 from django.forms.fields import TypedChoiceField
 from django.forms.forms import BaseForm
 from django.forms.models import (
     BaseInlineFormSet,
+    BaseModelFormSet,
     ModelChoiceField,
+    ModelForm,
     ModelMultipleChoiceField,
 )
 from django.forms.widgets import Media
@@ -81,15 +85,15 @@ class BaseModelAdmin(Generic[_ModelT]):
     prepopulated_fields: Mapping[str, Sequence[str]] = ...
     formfield_overrides: Mapping[type[Field[Any, Any]], Mapping[str, Any]] = ...
     readonly_fields: Sequence[str | Callable[[_ModelT], Any]] = ...
-    ordering: Sequence[str] = ...
-    sortable_by: Sequence[str] = ...
+    ordering: Sequence[str] | None = ...
+    sortable_by: Sequence[str] | None = ...
     view_on_site: bool = ...
     show_full_result_count: bool = ...
     checks_class: Any = ...
     def check(self, **kwargs: Any) -> list[CheckMessage]: ...
     def formfield_for_dbfield(
         self, db_field: Field[Any, Any], request: HttpRequest | None, **kwargs: Any
-    ) -> Field[Any, Any] | None: ...
+    ) -> FormField | None: ...
     def formfield_for_choice_field(
         self, db_field: Field[Any, Any], request: HttpRequest | None, **kwargs: Any
     ) -> TypedChoiceField: ...
@@ -105,10 +109,12 @@ class BaseModelAdmin(Generic[_ModelT]):
         request: HttpRequest | None,
         **kwargs: Any
     ) -> ModelMultipleChoiceField: ...
-    def get_autocomplete_fields(self, request: HttpRequest) -> tuple[Any, ...]: ...
+    def get_autocomplete_fields(self, request: HttpRequest) -> Sequence[str]: ...
     def get_view_on_site_url(self, obj: _ModelT | None = ...) -> str | None: ...
     def get_empty_value_display(self) -> SafeText: ...
-    def get_exclude(self, request: HttpRequest, obj: _ModelT | None = ...) -> Any: ...
+    def get_exclude(
+        self, request: HttpRequest, obj: _ModelT | None = ...
+    ) -> Sequence[str]: ...
     def get_fields(
         self, request: HttpRequest, obj: _ModelT | None = ...
     ) -> Sequence[Callable[..., Any] | str]: ...
@@ -122,10 +128,13 @@ class BaseModelAdmin(Generic[_ModelT]):
     def get_prepopulated_fields(
         self, request: HttpRequest, obj: _ModelT | None = ...
     ) -> dict[str, tuple[str]]: ...
-    def get_queryset(self, request: HttpRequest) -> QuerySet[Any]: ...
+    def get_queryset(self, request: HttpRequest) -> QuerySet[_ModelT]: ...
     def get_sortable_by(
         self, request: HttpRequest
     ) -> list[Callable[..., Any]] | list[str] | tuple[Any, ...]: ...
+    def get_inlines(
+        self, request: HttpRequest, obj: _ModelT | None
+    ) -> Iterable[type[InlineModelAdmin[Any]]]: ...
     def lookup_allowed(self, lookup: str, value: str) -> bool: ...
     def to_field_allowed(self, request: HttpRequest, to_field: str) -> bool: ...
     def has_add_permission(self, request: HttpRequest) -> bool: ...
@@ -167,12 +176,12 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
         Callable[[ModelAdmin[Any], HttpRequest, QuerySet[Any]], HttpResponse | None]
         | str
     ] | None = ...
-    action_form: Any = ...
+    action_form: type[ActionForm] = ...
     actions_on_top: bool = ...
     actions_on_bottom: bool = ...
     actions_selection_counter: bool = ...
     model: type[_ModelT] = ...
-    opts: Options[Any] = ...
+    opts: Options[_ModelT] = ...
     admin_site: AdminSite = ...
     def __init__(self, model: type[_ModelT], admin_site: AdminSite | None) -> None: ...
     def get_inline_instances(
@@ -185,8 +194,12 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
     def media(self) -> Media: ...
     def get_model_perms(self, request: HttpRequest) -> dict[str, bool]: ...
     def get_form(
-        self, request: Any, obj: _ModelT | None = ..., change: bool = ..., **kwargs: Any
-    ) -> Any: ...
+        self,
+        request: HttpRequest,
+        obj: _ModelT | None = ...,
+        change: bool = ...,
+        **kwargs: Any
+    ) -> type[ModelForm]: ...
     def get_changelist(
         self, request: HttpRequest, **kwargs: Any
     ) -> type[ChangeList]: ...
@@ -194,15 +207,19 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
     def get_object(
         self, request: HttpRequest, object_id: str, from_field: None = ...
     ) -> _ModelT | None: ...
-    def get_changelist_form(self, request: Any, **kwargs: Any) -> Any: ...
-    def get_changelist_formset(self, request: Any, **kwargs: Any) -> Any: ...
+    def get_changelist_form(
+        self, request: HttpRequest, **kwargs: Any
+    ) -> type[ModelForm]: ...
+    def get_changelist_formset(
+        self, request: HttpRequest, **kwargs: Any
+    ) -> type[BaseModelFormSet]: ...
     def get_formsets_with_inlines(
         self, request: HttpRequest, obj: _ModelT | None = ...
     ) -> Iterator[Any]: ...
     def get_paginator(
         self,
         request: HttpRequest,
-        queryset: QuerySet[Any],
+        queryset: QuerySet[_ModelT],
         per_page: int,
         orphans: int = ...,
         allow_empty_first_page: bool = ...,
@@ -235,12 +252,6 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
         self, request: HttpRequest, queryset: QuerySet[Any], search_term: str
     ) -> tuple[QuerySet[Any], bool]: ...
     def get_preserved_filters(self, request: HttpRequest) -> str: ...
-    def _get_edited_object_pks(
-        self, request: HttpRequest, prefix: str
-    ) -> list[str]: ...
-    def _get_list_editable_queryset(
-        self, request: HttpRequest, prefix: str
-    ) -> QuerySet[Any]: ...
     def construct_change_message(
         self,
         request: HttpRequest,
@@ -256,29 +267,39 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
         extra_tags: str = ...,
         fail_silently: bool = ...,
     ) -> None: ...
-    def save_form(self, request: Any, form: Any, change: Any) -> Any: ...
+    def save_form(
+        self, request: HttpRequest, form: ModelForm, change: bool
+    ) -> _ModelT: ...
     def save_model(
-        self, request: Any, obj: _ModelT, form: Any, change: Any
+        self, request: HttpRequest, obj: _ModelT, form: ModelForm, change: bool
     ) -> None: ...
     def delete_model(self, request: HttpRequest, obj: _ModelT) -> None: ...
     def delete_queryset(
-        self, request: HttpRequest, queryset: QuerySet[Any]
+        self, request: HttpRequest, queryset: QuerySet[_ModelT]
     ) -> None: ...
     def save_formset(
-        self, request: Any, form: Any, formset: Any, change: Any
+        self,
+        request: HttpRequest,
+        form: ModelForm,
+        formset: BaseModelFormSet,
+        change: bool,
     ) -> None: ...
     def save_related(
-        self, request: Any, form: Any, formsets: Any, change: Any
+        self,
+        request: HttpRequest,
+        form: ModelForm,
+        formsets: BaseModelFormSet,
+        change: bool,
     ) -> None: ...
     def render_change_form(
         self,
-        request: Any,
-        context: Any,
+        request: HttpRequest,
+        context: Mapping[str, Any],
         add: bool = ...,
         change: bool = ...,
         form_url: str = ...,
         obj: _ModelT | None = ...,
-    ) -> Any: ...
+    ) -> TemplateResponse: ...
     def response_add(
         self, request: HttpRequest, obj: _ModelT, post_url_continue: str | None = ...
     ) -> HttpResponse: ...
@@ -290,12 +311,14 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
         self, request: HttpRequest, obj: _ModelT
     ) -> HttpResponseRedirect: ...
     def response_action(
-        self, request: HttpRequest, queryset: QuerySet[Any]
+        self, request: HttpRequest, queryset: QuerySet[_ModelT]
     ) -> HttpResponseBase | None: ...
     def response_delete(
         self, request: HttpRequest, obj_display: str, obj_id: int
     ) -> HttpResponse: ...
-    def render_delete_form(self, request: Any, context: Any) -> Any: ...
+    def render_delete_form(
+        self, request: HttpRequest, context: Mapping[str, Any]
+    ) -> TemplateResponse: ...
     def get_inline_formsets(
         self,
         request: HttpRequest,
@@ -310,7 +333,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
         object_id: str | None = ...,
         form_url: str = ...,
         extra_context: dict[str, bool] | None = ...,
-    ) -> Any: ...
+    ) -> TemplateResponse: ...
     def autocomplete_view(self, request: HttpRequest) -> JsonResponse: ...
     def add_view(
         self, request: HttpRequest, form_url: str = ..., extra_context: None = ...
@@ -329,10 +352,16 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
         self, objs: QuerySet[Any], request: HttpRequest
     ) -> tuple[list[Any], dict[Any, Any], set[Any], list[Any]]: ...
     def delete_view(
-        self, request: HttpRequest, object_id: str, extra_context: None = ...
-    ) -> Any: ...
+        self,
+        request: HttpRequest,
+        object_id: str,
+        extra_context: dict[str, str] | None = ...,
+    ) -> HttpResponse: ...
     def history_view(
-        self, request: HttpRequest, object_id: str, extra_context: None = ...
+        self,
+        request: HttpRequest,
+        object_id: str,
+        extra_context: dict[str, str] | None = ...,
     ) -> HttpResponse: ...
     def get_formset_kwargs(
         self,
@@ -374,8 +403,8 @@ class InlineModelAdmin(BaseModelAdmin[_ModelT]):
         self, request: HttpRequest, obj: _ModelT | None = ..., **kwargs: Any
     ) -> int | None: ...
     def get_formset(
-        self, request: Any, obj: _ModelT | None = ..., **kwargs: Any
-    ) -> Any: ...
+        self, request: HttpRequest, obj: _ModelT | None = ..., **kwargs: Any
+    ) -> type[BaseInlineFormSet]: ...
 
 class StackedInline(InlineModelAdmin[_ModelT]): ...
 class TabularInline(InlineModelAdmin[_ModelT]): ...

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/sites.pyi

@@ -3,8 +3,8 @@ from typing import Any
 
 from django.apps.config import AppConfig
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
+from django.http.request import HttpRequest
 from django.http.response import HttpResponse
 from django.template.response import TemplateResponse
 from django.urls.resolvers import URLResolver
@@ -53,7 +53,7 @@ class AdminSite:
     def empty_value_display(self) -> Any: ...
     @empty_value_display.setter
     def empty_value_display(self, empty_value_display: Any) -> None: ...
-    def has_permission(self, request: WSGIRequest) -> bool: ...
+    def has_permission(self, request: HttpRequest) -> bool: ...
     def admin_view(
         self, view: Callable[..., Any], cacheable: bool = ...
     ) -> Callable[..., Any]: ...
@@ -62,30 +62,30 @@ class AdminSite:
     def urls(self) -> tuple[list[URLResolver], str, str]: ...
     def each_context(self, request: Any) -> Any: ...
     def password_change(
-        self, request: WSGIRequest, extra_context: dict[str, Any] | None = ...
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = ...
     ) -> TemplateResponse: ...
     def password_change_done(
-        self, request: WSGIRequest, extra_context: dict[str, Any] | None = ...
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = ...
     ) -> TemplateResponse: ...
     def i18n_javascript(
-        self, request: WSGIRequest, extra_context: dict[Any, Any] | None = ...
+        self, request: HttpRequest, extra_context: dict[Any, Any] | None = ...
     ) -> HttpResponse: ...
     def logout(
-        self, request: WSGIRequest, extra_context: dict[str, Any] | None = ...
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = ...
     ) -> TemplateResponse: ...
     def login(
-        self, request: WSGIRequest, extra_context: dict[str, Any] | None = ...
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = ...
     ) -> HttpResponse: ...
     def _build_app_dict(
-        self, request: WSGIRequest, label: str | None = ...
+        self, request: HttpRequest, label: str | None = ...
     ) -> dict[str, Any]: ...
-    def get_app_list(self, request: WSGIRequest) -> list[Any]: ...
+    def get_app_list(self, request: HttpRequest) -> list[Any]: ...
     def index(
-        self, request: WSGIRequest, extra_context: dict[str, Any] | None = ...
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = ...
     ) -> TemplateResponse: ...
     def app_index(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         app_label: str,
         extra_context: dict[str, Any] | None = ...,
     ) -> TemplateResponse: ...

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/templatetags/base.pyi

@@ -10,7 +10,7 @@ class InclusionAdminNode(InclusionNode):
     args: list[Any]
     func: Callable[..., Any]
     kwargs: dict[Any, Any]
-    takes_context: bool
+    takes_context: bool  # pyright: ignore[reportIncompatibleVariableOverride]
     template_name: str = ...
     def __init__(
         self,

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/utils.pyi

@@ -7,7 +7,6 @@ from uuid import UUID
 from django.contrib.admin.options import BaseModelAdmin
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.forms import AdminPasswordChangeForm
-from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.deletion import Collector
 from django.db.models.fields import Field, reverse_related
@@ -15,6 +14,7 @@ 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.http.request import HttpRequest
 
 class FieldIsAForeignKeyColumnName(Exception): ...
 
@@ -25,7 +25,7 @@ def unquote(s: str) -> str: ...
 def flatten(fields: Any) -> list[Callable[..., Any] | str]: ...
 def flatten_fieldsets(fieldsets: Any) -> list[Callable[..., Any] | str]: ...
 def get_deleted_objects(
-    objs: Sequence[Model | None], request: WSGIRequest, admin_site: AdminSite
+    objs: Sequence[Model | None], request: HttpRequest, admin_site: AdminSite
 ) -> tuple[list[Any], dict[Any, Any], set[Any], list[Any]]: ...
 
 class NestedObjects(Collector):

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/views/autocomplete.pyi

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

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admin/views/main.pyi

@@ -6,12 +6,13 @@ from django.contrib.admin.filters import ListFilter, SimpleListFilter
 from django.contrib.admin.options import IS_POPUP_VAR as IS_POPUP_VAR  # noqa: F401
 from django.contrib.admin.options import TO_FIELD_VAR as TO_FIELD_VAR
 from django.contrib.admin.options import ModelAdmin
-from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, CombinedExpression, OrderBy
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
 from django.forms.formsets import BaseFormSet
+from django.forms.models import ModelForm
+from django.http.request import HttpRequest
 
 ALL_VAR: str
 ORDER_VAR: str
@@ -47,10 +48,10 @@ class ChangeList:
     queryset: Any = ...
     title: Any = ...
     pk_attname: Any = ...
-    formset: BaseFormSet | None
+    formset: BaseFormSet[ModelForm] | None
     def __init__(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         model: type[Model],
         list_display: list[Callable[..., Any] | str] | tuple[str],
         list_display_links: list[Callable[..., Any]] | list[str] | tuple[str] | None,
@@ -66,7 +67,7 @@ class ChangeList:
     ) -> None: ...
     def get_filters_params(self, params: None = ...) -> dict[str, str]: ...
     def get_filters(
-        self, request: WSGIRequest
+        self, request: HttpRequest
     ) -> tuple[list[ListFilter], bool, dict[str, bool | str], bool]: ...
     def get_query_string(
         self,
@@ -81,15 +82,15 @@ class ChangeList:
     can_show_all: Any = ...
     multi_page: Any = ...
     paginator: Any = ...
-    def get_results(self, request: WSGIRequest) -> None: ...
+    def get_results(self, request: HttpRequest) -> None: ...
     def get_ordering_field(
         self, field_name: Callable[..., Any] | str
     ) -> CombinedExpression | str | None: ...
     def get_ordering(
-        self, request: WSGIRequest, queryset: QuerySet[Any]
+        self, request: HttpRequest, queryset: QuerySet[Any]
     ) -> list[OrderBy | Combinable | str]: ...
     def get_ordering_field_columns(self) -> OrderedDict[Any, Any]: ...
-    def get_queryset(self, request: WSGIRequest) -> QuerySet[Any]: ...
+    def get_queryset(self, request: HttpRequest) -> QuerySet[Any]: ...
     def apply_select_related(self, qs: QuerySet[Any]) -> QuerySet[Any]: ...
     def has_related_field_in_list_display(self) -> bool: ...
     def url_for_result(self, result: Model) -> str: ...

{django_types-0.19.1 → django_types-0.21.0}/django-stubs/contrib/admindocs/middleware.pyi

@@ -1,14 +1,14 @@
 from collections.abc import Callable
 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 XViewMiddleware(MiddlewareMixin):
     def process_view(
         self,
-        request: WSGIRequest,
+        request: HttpRequest,
         view_func: Callable[..., Any],
         view_args: tuple[Any, ...],
         view_kwargs: dict[Any, Any],