encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 08:29:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix #8077

Browse Source
This commit is contained in:
Anton Chasnyk 2021-08-10 14:05:52 +03:00
parent cdd53c7de9
commit 36bf34dd1b
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rest_framework/exceptions.py
View File

@ -142,7 +142,7 @@ class ValidationError(APIException):
default_detail = _('Invalid input.') default_detail = _('Invalid input.')
default_code = 'invalid' default_code = 'invalid'
def __init__(self, detail=None, code=None): def __init__(self, detail=None, code=None, params=None):
if detail is None: if detail is None:
detail = self.default_detail detail = self.default_detail
if code is None: if code is None:
@ -151,9 +151,18 @@ class ValidationError(APIException):
# For validation failures, we may collect many errors together, # For validation failures, we may collect many errors together,
# so the details should always be coerced to a list if not already. # so the details should always be coerced to a list if not already.
if isinstance(detail, tuple): if isinstance(detail, tuple):
detail = list(detail) detail_list = list()
if params is not None:
for msg in detail:
detail_list.append(msg % params)
detail = detail_list
else:
detail = list(detail)
elif not isinstance(detail, dict) and not isinstance(detail, list): elif not isinstance(detail, dict) and not isinstance(detail, list):
detail = [detail] if params is not None:
detail = [detail % params]
else:
detail = [detail]
self.detail = _get_error_details(detail, code) self.detail = _get_error_details(detail, code)

13
tests/test_validation_error.py
View File

@ -109,3 +109,16 @@ class TestValidationErrorConvertsTuplesToLists(TestCase):
assert len(error.detail) == 2 assert len(error.detail) == 2
assert str(error.detail[0]) == 'message1' assert str(error.detail[0]) == 'message1'
assert str(error.detail[1]) == 'message2' assert str(error.detail[1]) == 'message2'
class TestvalidationErrorWithDjangoStyle(TestCase):
def test_validation_error_details(self):
error = ValidationError('Invalid value: %(value)s', params={'value': '42'})
s = str(error.detail)
assert str(error.detail[0]) == 'Invalid value: 42'
def test_validation_error_details_tuple(self):
error = ValidationError(detail=('Invalid value: %(value1)s', 'Invalid value: %(value2)s'), params={'value1': '42', 'value2':'43'})
assert isinstance(error.detail, list)
assert len(error.detail) == 2
assert str(error.detail[0]) == 'Invalid value: 42'
assert str(error.detail[1]) == 'Invalid value: 43'