django-types 0.20.0__py3-none-any.whl → 0.22.0__py3-none-any.whl

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-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-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-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-stubs/contrib/admin/options.pyi

@@ -1,7 +1,7 @@
 from collections import OrderedDict
-from collections.abc import Callable, Iterator, Mapping, Sequence
-from typing import Any, Generic, Iterable, 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
@@ -17,6 +17,7 @@ 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 (
@@ -92,7 +93,7 @@ class BaseModelAdmin(Generic[_ModelT]):
     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: ...

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-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-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-stubs/contrib/admin/views/main.pyi

@@ -6,13 +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
@@ -51,7 +51,7 @@ class ChangeList:
     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,
@@ -67,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,
@@ -82,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-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],

django-stubs/contrib/auth/admin.pyi

@@ -2,7 +2,7 @@ from collections.abc import Callable
 from typing import Any, TypeVar
 
 from django.contrib import admin
-from django.core.handlers.wsgi import WSGIRequest
+from django.http.request import HttpRequest
 from django.http.response import HttpResponse
 
 _F = TypeVar("_F", bound=Callable[..., Any])
@@ -18,5 +18,5 @@ class UserAdmin(admin.ModelAdmin[Any]):
     add_form: Any = ...
     change_password_form: Any = ...
     def user_change_password(
-        self, request: WSGIRequest, id: str, form_url: str = ...
+        self, request: HttpRequest, id: str, form_url: str = ...
     ) -> HttpResponse: ...

django-stubs/contrib/auth/backends.pyi

@@ -17,22 +17,43 @@ class BaseBackend:
         password: str | None = ...,
         **kwargs: Any
     ) -> AbstractBaseUser | None: ...
+    async def aauthenticate(
+        self,
+        request: HttpRequest,
+        username: str | None = ...,
+        password: str | None = ...,
+        **kwargs: Any
+    ) -> AbstractBaseUser | None: ...
     def get_user(self, user_id: int) -> AbstractBaseUser | None: ...
+    async def aget_user(self, user_id: int) -> AbstractBaseUser | None: ...
     def get_user_permissions(
         self, user_obj: _AnyUser, obj: Model | None = ...
     ) -> set[str]: ...
+    async def aget_user_permissions(
+        self, user_obj: _AnyUser, obj: Model | None = ...
+    ) -> set[str]: ...
     def get_group_permissions(
         self, user_obj: _AnyUser, obj: Model | None = ...
     ) -> set[str]: ...
+    async def aget_group_permissions(
+        self, user_obj: _AnyUser, obj: Model | None = ...
+    ) -> set[str]: ...
     def get_all_permissions(
         self, user_obj: _AnyUser, obj: Model | None = ...
     ) -> set[str]: ...
+    async def aget_all_permissions(
+        self, user_obj: _AnyUser, obj: Model | None = ...
+    ) -> set[str]: ...
     def has_perm(
         self, user_obj: _AnyUser, perm: str, obj: Model | None = ...
     ) -> bool: ...
+    async def ahas_perm(
+        self, user_obj: _AnyUser, perm: str, obj: Model | None = ...
+    ) -> bool: ...
 
 class ModelBackend(BaseBackend):
     def has_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
+    async def ahas_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
     def user_can_authenticate(self, user: _AnyUser | None) -> bool: ...
     def with_perm(
         self,
@@ -48,5 +69,6 @@ class RemoteUserBackend(ModelBackend):
     create_unknown_user: bool = ...
     def clean_username(self, username: str) -> str: ...
     def configure_user(self, request: HttpRequest, user: User) -> User: ...
+    async def aconfigure_user(self, request: HttpRequest, user: User) -> User: ...
 
 class AllowAllUsersRemoteUserBackend(RemoteUserBackend): ...

django-stubs/contrib/auth/base_user.pyi

@@ -1,5 +1,4 @@
-from typing import Any, TypeVar
-from typing_extensions import Literal
+from typing import Any, Literal, TypeVar
 
 from django.db import models
 from django.db.models.base import Model
@@ -15,6 +14,7 @@ class BaseUserManager(models.Manager[_ModelT]):
         self, length: int = ..., allowed_chars: str = ...
     ) -> str: ...
     def get_by_natural_key(self, username: str) -> _ModelT: ...
+    async def aget_by_natural_key(self, username: str) -> _ModelT: ...
 
 class AbstractBaseUser(models.Model):
     REQUIRED_FIELDS: list[str] = ...

django-stubs/contrib/auth/forms.pyi

@@ -35,7 +35,7 @@ class AuthenticationForm(forms.Form):
     password: Any = ...
     error_messages: Any = ...
     request: WSGIRequest = ...
-    user_cache: None = ...
+    user_cache: AbstractBaseUser | None = ...
     username_field: Any = ...
     def __init__(self, request: Any = ..., *args: Any, **kwargs: Any) -> None: ...
     def confirm_login_allowed(self, user: AbstractBaseUser) -> None: ...

django-stubs/contrib/auth/middleware.pyi

@@ -1,9 +1,8 @@
 from django.contrib.auth.models import AnonymousUser, User
-from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
 from django.utils.deprecation import MiddlewareMixin
 
-def get_user(request: WSGIRequest) -> AnonymousUser | User: ...
+def get_user(request: HttpRequest) -> AnonymousUser | User: ...
 
 class AuthenticationMiddleware(MiddlewareMixin):
     def process_request(self, request: HttpRequest) -> None: ...

django-stubs/contrib/auth/models.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
-from typing import Any, ClassVar, TypeVar
-from typing_extensions import Literal, Never, Self
+from typing import Any, ClassVar, Literal, TypeVar
+from typing_extensions import Never, Self
 
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser
@@ -58,6 +58,13 @@ class UserManager(BaseUserManager[_T]):
         password: str | None = ...,
         **extra_fields: Any,
     ) -> _T: ...
+    async def acreate_user(
+        self,
+        username: str,
+        email: str | None = ...,
+        password: str | None = ...,
+        **extra_fields: Any,
+    ) -> _T: ...
     def create_superuser(
         self,
         username: str,
@@ -65,6 +72,13 @@ class UserManager(BaseUserManager[_T]):
         password: str | None,
         **extra_fields: Any,
     ) -> _T: ...
+    async def acreate_superuser(
+        self,
+        username: str,
+        email: str | None,
+        password: str | None,
+        **extra_fields: Any,
+    ) -> _T: ...
     def with_perm(
         self,
         perm: str | Permission,
@@ -79,11 +93,19 @@ class PermissionsMixin(models.Model):
     groups = models.ManyToManyField[Group, Any](Group)
     user_permissions = models.ManyToManyField[Permission, Any](Permission)
     def get_user_permissions(self, obj: Model | None = ...) -> set[str]: ...
+    async def aget_user_permissions(self, obj: Model | None = ...) -> set[str]: ...
     def get_group_permissions(self, obj: Model | None = ...) -> set[str]: ...
+    async def aget_group_permissions(self, obj: Model | None = ...) -> set[str]: ...
     def get_all_permissions(self, obj: Model | None = ...) -> set[str]: ...
+    async def aget_all_permissions(self, obj: Model | None = ...) -> set[str]: ...
     def has_perm(self, perm: str, obj: Model | None = ...) -> bool: ...
+    async def ahas_perm(self, perm: str, obj: Model | None = ...) -> bool: ...
     def has_perms(self, perm_list: Iterable[str], obj: Model | None = ...) -> bool: ...
+    async def ahas_perms(
+        self, perm_list: Iterable[str], obj: Model | None = ...
+    ) -> bool: ...
     def has_module_perms(self, app_label: str) -> bool: ...
+    async def ahas_module_perms(self, app_label: str) -> bool: ...
 
 class AbstractUser(AbstractBaseUser, PermissionsMixin):
     username_validator: UnicodeUsernameValidator = ...

django-stubs/contrib/auth/views.pyi

@@ -2,7 +2,6 @@ from typing import Any
 
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.contrib.auth.forms import AuthenticationForm
-from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
 from django.template.response import TemplateResponse
@@ -27,7 +26,7 @@ class LogoutView(SuccessURLAllowedHostsMixin, TemplateView):
     redirect_field_name: Any = ...
     extra_context: Any = ...
     def post(
-        self, request: WSGIRequest, *args: Any, **kwargs: Any
+        self, request: HttpRequest, *args: Any, **kwargs: Any
     ) -> TemplateResponse: ...
     def get_next_page(self) -> str | None: ...
 

django-stubs/contrib/flatpages/middleware.pyi

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

django-stubs/contrib/flatpages/views.pyi

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

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

@@ -1,6 +1,5 @@
 from collections.abc import Callable, Iterable
-from typing import Any, Generic, TypeVar, overload
-from typing_extensions import Literal
+from typing import Any, Generic, Literal, TypeVar, overload
 
 from django.db.models.expressions import Combinable
 from django.db.models.fields import Field, _ErrorMessagesToOverride, _ValidatorCallable

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

@@ -1,6 +1,5 @@
 from collections.abc import Callable, Iterable
-from typing import Any, TypeVar, overload
-from typing_extensions import Literal
+from typing import Any, Literal, TypeVar, overload
 
 from django.db.models.fields import CharField, EmailField, TextField
 

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

@@ -1,6 +1,5 @@
 from collections.abc import Callable, Iterable
-from typing import Any, Generic, TypeVar, overload
-from typing_extensions import Literal
+from typing import Any, Generic, Literal, TypeVar, overload
 
 from django.db.models import Field, Transform
 

django-stubs/contrib/staticfiles/finders.pyi

@@ -1,6 +1,5 @@
 from collections.abc import Iterable, Iterator, Mapping
-from typing import Any, overload
-from typing_extensions import Literal
+from typing import Any, Literal, overload
 
 from django.core.checks.messages import CheckMessage
 from django.core.files.storage import Storage

django-stubs/contrib/staticfiles/views.pyi

@@ -1,8 +1,8 @@
 from typing import Any
 
-from django.core.handlers.wsgi import WSGIRequest
+from django.http.request import HttpRequest
 from django.http.response import FileResponse
 
 def serve(
-    request: WSGIRequest, path: str, insecure: bool = ..., **kwargs: Any
+    request: HttpRequest, path: str, insecure: bool = ..., **kwargs: Any
 ) -> FileResponse: ...

django-stubs/contrib/syndication/views.pyi

@@ -1,8 +1,8 @@
 from typing import Any
 
 from django.core.exceptions import ObjectDoesNotExist
-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.utils.feedgenerator import Enclosure, SyndicationFeed
 from django.utils.safestring import SafeText
@@ -16,7 +16,7 @@ class Feed:
     title_template: Any = ...
     description_template: Any = ...
     def __call__(
-        self, request: WSGIRequest, *args: Any, **kwargs: Any
+        self, request: HttpRequest, *args: Any, **kwargs: Any
     ) -> HttpResponse: ...
     def item_title(self, item: Model) -> SafeText: ...
     def item_description(self, item: Model) -> str: ...
@@ -24,6 +24,6 @@ class Feed:
     def item_enclosures(self, item: Model) -> list[Enclosure]: ...
     def feed_extra_kwargs(self, obj: None) -> dict[Any, Any]: ...
     def item_extra_kwargs(self, item: Model) -> dict[Any, Any]: ...
-    def get_object(self, request: WSGIRequest, *args: Any, **kwargs: Any) -> None: ...
+    def get_object(self, request: HttpRequest, *args: Any, **kwargs: Any) -> None: ...
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ...
-    def get_feed(self, obj: None, request: WSGIRequest) -> SyndicationFeed: ...
+    def get_feed(self, obj: None, request: HttpRequest) -> SyndicationFeed: ...

django-stubs/core/exceptions.pyi

@@ -26,6 +26,13 @@ class FieldError(Exception): ...
 
 NON_FIELD_ERRORS: str
 
+ValidationErrorMessageArg = (
+    str
+    | ValidationError
+    | dict[str, ValidationErrorMessageArg]
+    | list[ValidationErrorMessageArg]
+)
+
 class ValidationError(Exception):
     error_dict: dict[str, list[ValidationError]] | None
     error_list: list[ValidationError] | None
@@ -34,12 +41,7 @@ class ValidationError(Exception):
     params: Mapping[str, Any] | None
     def __init__(
         self,
-        message: (
-            ValidationError
-            | dict[str, ValidationError | list[str]]
-            | list[ValidationError | str]
-            | str
-        ),
+        message: ValidationErrorMessageArg,
         code: str | None = ...,
         params: Mapping[str, Any] | None = ...,
     ) -> None: ...