mirror of https://github.com/django/django.git
Fixed #32389 -- Fixed ResponseHeaders crash when data is not mapping.
This commit is contained in:
parent
241da3f06e
commit
3c004075b1
|
@ -16,7 +16,9 @@ from django.core.exceptions import DisallowedRedirect
|
||||||
from django.core.serializers.json import DjangoJSONEncoder
|
from django.core.serializers.json import DjangoJSONEncoder
|
||||||
from django.http.cookie import SimpleCookie
|
from django.http.cookie import SimpleCookie
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.datastructures import CaseInsensitiveMapping
|
from django.utils.datastructures import (
|
||||||
|
CaseInsensitiveMapping, _destruct_iterable_mapping_values,
|
||||||
|
)
|
||||||
from django.utils.encoding import iri_to_uri
|
from django.utils.encoding import iri_to_uri
|
||||||
from django.utils.http import http_date
|
from django.utils.http import http_date
|
||||||
from django.utils.regex_helper import _lazy_re_compile
|
from django.utils.regex_helper import _lazy_re_compile
|
||||||
|
@ -31,10 +33,7 @@ class ResponseHeaders(CaseInsensitiveMapping):
|
||||||
correctly encoded.
|
correctly encoded.
|
||||||
"""
|
"""
|
||||||
if not isinstance(data, Mapping):
|
if not isinstance(data, Mapping):
|
||||||
data = {
|
data = {k: v for k, v in _destruct_iterable_mapping_values(data)}
|
||||||
k: v
|
|
||||||
for k, v in CaseInsensitiveMapping._destruct_iterable_mapping_values(data)
|
|
||||||
}
|
|
||||||
self._store = {}
|
self._store = {}
|
||||||
for header, value in data.items():
|
for header, value in data.items():
|
||||||
self[header] = value
|
self[header] = value
|
||||||
|
|
|
@ -835,6 +835,10 @@ class HttpResponseHeadersTestCase(SimpleTestCase):
|
||||||
# del doesn't raise a KeyError on nonexistent headers.
|
# del doesn't raise a KeyError on nonexistent headers.
|
||||||
del response['X-Foo']
|
del response['X-Foo']
|
||||||
|
|
||||||
|
def test_headers_as_iterable_of_tuple_pairs(self):
|
||||||
|
response = HttpResponse(headers=(('X-Foo', 'bar'),))
|
||||||
|
self.assertEqual(response['X-Foo'], 'bar')
|
||||||
|
|
||||||
def test_headers_bytestring(self):
|
def test_headers_bytestring(self):
|
||||||
response = HttpResponse()
|
response = HttpResponse()
|
||||||
response['X-Foo'] = b'bar'
|
response['X-Foo'] = b'bar'
|
||||||
|
|
Loading…
Reference in New Issue