mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-10 19:56:59 +03:00
Fixed AttributeError raised by data property being silently ignored (#9455)
Signed-off-by: James Riley McHugh <mchugh_james@bah.com> Co-authored-by: James Riley McHugh <mchugh_james@bah.com>
This commit is contained in:
parent
b6ea11028f
commit
8e304e1adb
|
@ -217,7 +217,8 @@ class Request:
|
||||||
@property
|
@property
|
||||||
def data(self):
|
def data(self):
|
||||||
if not _hasattr(self, '_full_data'):
|
if not _hasattr(self, '_full_data'):
|
||||||
self._load_data_and_files()
|
with wrap_attributeerrors():
|
||||||
|
self._load_data_and_files()
|
||||||
return self._full_data
|
return self._full_data
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -420,13 +421,14 @@ class Request:
|
||||||
_request = self.__getattribute__("_request")
|
_request = self.__getattribute__("_request")
|
||||||
return getattr(_request, attr)
|
return getattr(_request, attr)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
return self.__getattribute__(attr)
|
raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{attr}'")
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def POST(self):
|
def POST(self):
|
||||||
# Ensure that request.POST uses our request parsing.
|
# Ensure that request.POST uses our request parsing.
|
||||||
if not _hasattr(self, '_data'):
|
if not _hasattr(self, '_data'):
|
||||||
self._load_data_and_files()
|
with wrap_attributeerrors():
|
||||||
|
self._load_data_and_files()
|
||||||
if is_form_media_type(self.content_type):
|
if is_form_media_type(self.content_type):
|
||||||
return self._data
|
return self._data
|
||||||
return QueryDict('', encoding=self._request._encoding)
|
return QueryDict('', encoding=self._request._encoding)
|
||||||
|
@ -437,7 +439,8 @@ class Request:
|
||||||
# Different from the other two cases, which are not valid property
|
# Different from the other two cases, which are not valid property
|
||||||
# names on the WSGIRequest class.
|
# names on the WSGIRequest class.
|
||||||
if not _hasattr(self, '_files'):
|
if not _hasattr(self, '_files'):
|
||||||
self._load_data_and_files()
|
with wrap_attributeerrors():
|
||||||
|
self._load_data_and_files()
|
||||||
return self._files
|
return self._files
|
||||||
|
|
||||||
def force_plaintext_errors(self, value):
|
def force_plaintext_errors(self, value):
|
||||||
|
|
|
@ -126,6 +126,25 @@ class TestContentParsing(TestCase):
|
||||||
request.parsers = (PlainTextParser(), )
|
request.parsers = (PlainTextParser(), )
|
||||||
assert request.data == content
|
assert request.data == content
|
||||||
|
|
||||||
|
def test_calling_data_fails_when_attribute_error_is_raised(self):
|
||||||
|
"""
|
||||||
|
Ensure attribute errors raised when parsing are properly re-raised.
|
||||||
|
"""
|
||||||
|
expected_message = "Internal error"
|
||||||
|
|
||||||
|
class BrokenParser:
|
||||||
|
media_type = "application/json"
|
||||||
|
|
||||||
|
def parse(self, *args, **kwargs):
|
||||||
|
raise AttributeError(expected_message)
|
||||||
|
|
||||||
|
http_request = factory.post('/', data={}, format="json")
|
||||||
|
request = Request(http_request)
|
||||||
|
request.parsers = (BrokenParser,)
|
||||||
|
|
||||||
|
with self.assertRaisesMessage(WrappedAttributeError, expected_message):
|
||||||
|
request.data
|
||||||
|
|
||||||
|
|
||||||
class MockView(APIView):
|
class MockView(APIView):
|
||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user