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

Avoid suppressing custom ValidationError

Browse Source 
Solution for a specific case, when detail of ValidationError is
dictionary already.

closes https://github.com/encode/django-rest-framework/issues/6124
This commit is contained in:
Vlada Dusek 2018-08-14 15:55:48 +02:00
parent 90ed2c1ef7
commit 770b912a88
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/serializers.py
View File

@ -235,6 +235,8 @@ class BaseSerializer(Field):
try: try:
self._validated_data = self.run_validation(self.initial_data) self._validated_data = self.run_validation(self.initial_data)
except ValidationError as exc: except ValidationError as exc:
if isinstance(exc.detail, dict):
raise
self._validated_data = {} self._validated_data = {}
self._errors = exc.detail self._errors = exc.detail
else: else:
@ -489,6 +491,8 @@ class Serializer(BaseSerializer):
if validate_method is not None: if validate_method is not None:
validated_value = validate_method(validated_value) validated_value = validate_method(validated_value)
except ValidationError as exc: except ValidationError as exc:
if isinstance(exc.detail, dict):
raise
errors[field.field_name] = exc.detail errors[field.field_name] = exc.detail
except DjangoValidationError as exc: except DjangoValidationError as exc:
errors[field.field_name] = get_error_detail(exc) errors[field.field_name] = get_error_detail(exc)
@ -661,6 +665,8 @@ class ListSerializer(BaseSerializer):
try: try:
validated = self.child.run_validation(item) validated = self.child.run_validation(item)
except ValidationError as exc: except ValidationError as exc:
if isinstance(exc.detail, dict):
raise
errors.append(exc.detail) errors.append(exc.detail)
else: else:
ret.append(validated) ret.append(validated)
@ -744,6 +750,8 @@ class ListSerializer(BaseSerializer):
try: try:
self._validated_data = self.run_validation(self.initial_data) self._validated_data = self.run_validation(self.initial_data)
except ValidationError as exc: except ValidationError as exc:
if isinstance(exc.detail, dict):
raise
self._validated_data = [] self._validated_data = []
self._errors = exc.detail self._errors = exc.detail
else: else: