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

Merge c0c8833185 into 511e874185

Browse Source
This commit is contained in:
Ian Foote 2014-06-20 15:34:42 +00:00
commit ab6b4ab521
1 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rest_framework/serializers.py
View File

@ -495,7 +495,9 @@ class BaseSerializer(WritableField):
Run deserialization and return error data,
setting self.object if no errors occurred.
"""
if self._errors is None:
if self._errors is not None:
return self._errors
data, files = self.init_data, self.init_files
if self.many is not None:
@ -508,6 +510,22 @@ class BaseSerializer(WritableField):
DeprecationWarning, stacklevel=3)
if many:
return self._errors_many(data)
ret = self.from_native(data, files)
if not self._errors:
self.object = ret
return self._errors
def _errors_many(self, data):
"""Run deserialization of bulk data."""
if not hasattr(data, '__iter__') or isinstance(data, (dict, six.text_type)):
self._errors = {'non_field_errors': ['Expected a list of items.']}
return self._errors
ret = RelationsList()
errors = []
update = self.object is not None
@ -521,7 +539,6 @@ class BaseSerializer(WritableField):
identities = [self.get_identity(self.to_native(obj)) for obj in objects]
identity_to_objects = dict(zip(identities, objects))
if hasattr(data, '__iter__') and not isinstance(data, (dict, six.text_type)):
for item in data:
if update:
# Determine which object we're updating
@ -529,7 +546,8 @@ class BaseSerializer(WritableField):
self.object = identity_to_objects.pop(identity, None)
if self.object is None and not self.allow_add_remove:
ret.append(None)
errors.append({'non_field_errors': ['Cannot create a new item, only existing items may be updated.']})
errors.append({'non_field_errors': [
'Cannot create a new item, only existing items may be updated.']})
continue
ret.append(self.from_native(item, None))
@ -539,10 +557,6 @@ class BaseSerializer(WritableField):
ret._deleted = identity_to_objects.values()
self._errors = any(errors) and errors or []
else:
self._errors = {'non_field_errors': ['Expected a list of items.']}
else:
ret = self.from_native(data, files)
if not self._errors:
self.object = ret