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

Split errors into errors and _errors_many

Browse Source 
Reduce indentation and linearize code to improve readability.
This commit is contained in:
Ian Foote 2014-03-27 15:38:21 +00:00
parent f64599c361
commit c0c8833185
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
rest_framework/serializers.py
View File

@ -507,12 +507,21 @@ class BaseSerializer(WritableField):
'Use the `many=True` flag when instantiating the serializer.', 'Use the `many=True` flag when instantiating the serializer.',
DeprecationWarning, stacklevel=3) DeprecationWarning, stacklevel=3)
if not many: if many:
ret = self.from_native(data, files) return self._errors_many(data)
if not self._errors: ret = self.from_native(data, files)
self.object = ret
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 return self._errors
ret = RelationsList() ret = RelationsList()
@ -528,27 +537,24 @@ class BaseSerializer(WritableField):
identities = [self.get_identity(self.to_native(obj)) for obj in objects] identities = [self.get_identity(self.to_native(obj)) for obj in objects]
identity_to_objects = dict(zip(identities, objects)) identity_to_objects = dict(zip(identities, objects))
if hasattr(data, '__iter__') and not isinstance(data, (dict, six.text_type)): for item in data:
for item in data: if update:
if update: # Determine which object we're updating
# Determine which object we're updating identity = self.get_identity(item)
identity = self.get_identity(item) self.object = identity_to_objects.pop(identity, None)
self.object = identity_to_objects.pop(identity, None) if self.object is None and not self.allow_add_remove:
if self.object is None and not self.allow_add_remove: ret.append(None)
ret.append(None) errors.append({'non_field_errors': [
errors.append({'non_field_errors': [ 'Cannot create a new item, only existing items may be updated.']})
'Cannot create a new item, only existing items may be updated.']}) continue
continue
ret.append(self.from_native(item, None)) ret.append(self.from_native(item, None))
errors.append(self._errors) errors.append(self._errors)
if update and self.allow_add_remove: if update and self.allow_add_remove:
ret._deleted = identity_to_objects.values() ret._deleted = identity_to_objects.values()
self._errors = any(errors) and errors or [] self._errors = any(errors) and errors or []
else:
self._errors = {'non_field_errors': ['Expected a list of items.']}
if not self._errors: if not self._errors:
self.object = ret self.object = ret