mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-05-21 06:16:29 +00:00
Code Issues 32 Releases Wiki Activity

Replaced deprecated functions.

Browse Source
This commit is contained in:
GappleBee 2024-11-21 19:19:11 +00:00
parent 1dc83aceb6
commit abc9ea61ef
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/http/request.py
View File

@ -3,6 +3,7 @@ import copy
import operator import operator
from collections import namedtuple from collections import namedtuple
from cgi import parse_header
from io import BytesIO from io import BytesIO
from itertools import chain from itertools import chain
from urllib.parse import parse_qsl, quote, urlencode, urljoin, urlsplit from urllib.parse import parse_qsl, quote, urlencode, urljoin, urlsplit
@ -20,7 +21,6 @@ from django.core.files import uploadhandler
from django.http.multipartparser import ( from django.http.multipartparser import (
MultiPartParser, MultiPartParser,
MultiPartParserError, MultiPartParserError,
TooManyFilesSent,
) )
from django.utils.datastructures import ( from django.utils.datastructures import (
CaseInsensitiveMapping, CaseInsensitiveMapping,
@ -29,13 +29,11 @@ from django.utils.datastructures import (
) )
from django.utils.encoding import escape_uri_path, iri_to_uri from django.utils.encoding import escape_uri_path, iri_to_uri
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.http import is_same_domain, parse_header_parameters from django.utils.http import is_same_domain
from django.utils.regex_helper import _lazy_re_compile
RAISE_ERROR = object() RAISE_ERROR = object()
host_validation_re = _lazy_re_compile( MAX_ALLOWED_FILES = 1000
r"^([a-z0-9.-]+|\[[a-f0-9]*:[a-f0-9\.:]+\])(?::([0-9]+))?$" host_validation_re = r"^([a-z0-9.-]+|\[[a-f0-9]*:[a-f0-9\.:]+\])(?::([0-9]+))?$"
)
ParsedHostHeader = namedtuple("ParsedHostHeader", ["domain", "port", "combined"]) ParsedHostHeader = namedtuple("ParsedHostHeader", ["domain", "port", "combined"])
@ -138,7 +136,7 @@ class HttpRequest:
def _set_content_type_params(self, meta): def _set_content_type_params(self, meta):
"""Set content_type, content_params, and encoding.""" """Set content_type, content_params, and encoding."""
self.content_type, self.content_params = parse_header_parameters( self.content_type, self.content_params = parse_header(
meta.get("CONTENT_TYPE", "") meta.get("CONTENT_TYPE", "")
) )
if "charset" in self.content_params: if "charset" in self.content_params:
@ -437,7 +435,11 @@ class HttpRequest:
data = self data = self
try: try:
self._post, self._files = self.parse_file_upload(self.META, data) self._post, self._files = self.parse_file_upload(self.META, data)
except (MultiPartParserError, TooManyFilesSent): if len(self._files) > MAX_ALLOWED_FILES:
raise MultiPartParserError(
f"{len(self._files)} files processed. Maximum {MAX_ALLOWED_FILES} files allowed."
)
except MultiPartParserError:
# An error occurred while parsing POST data. Since when # An error occurred while parsing POST data. Since when
# formatting the error the request handler might access # formatting the error the request handler might access
# self.POST, set self._post and self._file to prevent # self.POST, set self._post and self._file to prevent
@ -719,7 +721,7 @@ class QueryDict(MultiValueDict):
class MediaType: class MediaType:
def __init__(self, media_type_raw_line): def __init__(self, media_type_raw_line):
full_type, self.params = parse_header_parameters( full_type, self.params = parse_header(
media_type_raw_line if media_type_raw_line else "" media_type_raw_line if media_type_raw_line else ""
) )
self.main_type, _, self.sub_type = full_type.partition("/") self.main_type, _, self.sub_type = full_type.partition("/")