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

Merge a2d5a07ae7 into 650a91ac24

Browse Source
This commit is contained in:
kakulukia 2014-11-03 12:31:43 +00:00
commit aa4fe0799b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rest_framework/fields.py
View File

@ -260,6 +260,7 @@ class WritableField(Field):
default_error_messages = { default_error_messages = {
'required': _('This field is required.'), 'required': _('This field is required.'),
'invalid': _('Invalid value.'), 'invalid': _('Invalid value.'),
'invalid_data': _('Invalid data.'),
} }
widget = widgets.TextInput widget = widgets.TextInput
default = None default = None

2
rest_framework/serializers.py
View File

@ -278,7 +278,7 @@ class BaseSerializer(WritableField):
reverted_data = {} reverted_data = {}
if data is not None and not isinstance(data, dict): if data is not None and not isinstance(data, dict):
self._errors['non_field_errors'] = ['Invalid data'] self._errors['non_field_errors'] = [self.error_messages['invalid_data']]
return None return None
for field_name, field in self.fields.items(): for field_name, field in self.fields.items():