Improve django.http stubs (#2201)

Author: Viicos

django-stubs/http/__init__.pyi

@@ -1,5 +1,6 @@
 from .cookie import SimpleCookie as SimpleCookie
 from .cookie import parse_cookie as parse_cookie
+from .request import HttpHeaders as HttpHeaders
 from .request import HttpRequest as HttpRequest
 from .request import QueryDict as QueryDict
 from .request import RawPostDataException as RawPostDataException

django-stubs/http/multipartparser.pyi

@@ -1,5 +1,6 @@
+import re
 from collections.abc import Iterator, Mapping
-from typing import IO, Any, Literal
+from typing import IO, Any, ClassVar, Literal
 
 from django.http.request import QueryDict
 from django.utils.datastructures import ImmutableList, MultiValueDict
@@ -13,6 +14,7 @@ FIELD: Literal["field"]
 FIELD_TYPES: frozenset[str]
 
 class MultiPartParser:
+    boundary_re: ClassVar[re.Pattern[str]]
     def __init__(
         self,
         META: Mapping[str, Any],
@@ -23,6 +25,7 @@ class MultiPartParser:
     def parse(self) -> tuple[QueryDict, MultiValueDict]: ...
     def handle_file_complete(self, old_field_name: str, counters: list[int]) -> None: ...
     def sanitize_file_name(self, file_name: str) -> str | None: ...
+    def IE_sanitize(self, file_name: str) -> str | None: ...
 
 class LazyStream:
     length: int | None

django-stubs/http/request.pyi

@@ -20,7 +20,7 @@ host_validation_re: Pattern[str]
 class UnreadablePostError(OSError): ...
 class RawPostDataException(Exception): ...
 
-UploadHandlerList: TypeAlias = list[uploadhandler.FileUploadHandler] | ImmutableList[uploadhandler.FileUploadHandler]
+_UploadHandlerList: TypeAlias = list[uploadhandler.FileUploadHandler] | ImmutableList[uploadhandler.FileUploadHandler]
 
 class HttpHeaders(CaseInsensitiveMapping[str]):
     HTTP_PREFIX: str
@@ -80,20 +80,18 @@ class HttpRequest(BytesIO):
     def get_signed_cookie(
         self, key: str, default: Any = ..., salt: str = ..., max_age: int | datetime.timedelta | None = ...
     ) -> str | None: ...
-    def get_raw_uri(self) -> str: ...
     def build_absolute_uri(self, location: str | None = ...) -> str: ...
     @property
     def scheme(self) -> str | None: ...
     def is_secure(self) -> bool: ...
-    def is_ajax(self) -> bool: ...
     @property
     def encoding(self) -> str | None: ...
     @encoding.setter
     def encoding(self, val: str) -> None: ...
     @property
-    def upload_handlers(self) -> UploadHandlerList: ...
+    def upload_handlers(self) -> _UploadHandlerList: ...
     @upload_handlers.setter
-    def upload_handlers(self, upload_handlers: UploadHandlerList) -> None: ...
+    def upload_handlers(self, upload_handlers: _UploadHandlerList) -> None: ...
     @cached_property
     def accepted_types(self) -> list[MediaType]: ...
     def parse_file_upload(
@@ -105,6 +103,7 @@ class HttpRequest(BytesIO):
     def body(self) -> bytes: ...
     def _load_post_and_files(self) -> None: ...
     def accepts(self, media_type: str) -> bool: ...
+    def readlines(self) -> list[bytes]: ...  # type: ignore[override]
 
 @type_check_only
 class _MutableHttpRequest(HttpRequest):
@@ -213,3 +212,4 @@ def bytes_to_text(s: None, encoding: str) -> None: ...
 def bytes_to_text(s: bytes | str, encoding: str) -> str: ...
 def split_domain_port(host: str) -> tuple[str, str]: ...
 def validate_host(host: str, allowed_hosts: Iterable[str]) -> bool: ...
+def parse_accept_header(header: str) -> list[MediaType]: ...

scripts/stubtest/allowlist.txt

@@ -107,6 +107,7 @@ django.utils.translation.template.constant_re
 django.utils.translation.template.block_re
 django.utils.version.version_component_re
 django.views.debug.SafeExceptionReporterFilter.hidden_settings
+django.http.multipartparser.MultiPartParser.boundary_re
 
 # AlterTogetherOptionOperation.option_name is set as None,
 # but is required in the init, so we type it as str

scripts/stubtest/allowlist_todo.txt

@@ -1336,20 +1336,9 @@ django.forms.widgets.SelectDateWidget.use_fieldset
 django.forms.widgets.TextInput.__slotnames__
 django.forms.widgets.Widget.subwidgets
 django.forms.widgets.Widget.use_fieldset
-django.http.HttpHeaders
 django.http.HttpRequest.__init__
-django.http.HttpRequest.get_raw_uri
-django.http.HttpRequest.is_ajax
-django.http.HttpRequest.readlines
 django.http.StreamingHttpResponse.content
-django.http.multipartparser.MultiPartParser.IE_sanitize
-django.http.multipartparser.MultiPartParser.boundary_re
 django.http.request.HttpRequest.__init__
-django.http.request.HttpRequest.get_raw_uri
-django.http.request.HttpRequest.is_ajax
-django.http.request.HttpRequest.readlines
-django.http.request.UploadHandlerList
-django.http.request.parse_accept_header
 django.http.response.StreamingHttpResponse.content
 django.template.EngineHandler.__init__
 django.template.Library.filter_function