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

Reduce indentation in BaseSerializer.errors

Browse Source 
This makes the method more linear and easier to read.
This commit is contained in:
Ian Foote 2014-03-27 15:20:13 +00:00
parent 2a27674a79
commit f64599c361
1 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/serializers.py
View File

@ -493,7 +493,9 @@ class BaseSerializer(WritableField):
Run deserialization and return error data, Run deserialization and return error data,
setting self.object if no errors occurred. 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 data, files = self.init_data, self.init_files
if self.many is not None: if self.many is not None:
@ -505,7 +507,14 @@ 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 many: if not many:
ret = self.from_native(data, files)
if not self._errors:
self.object = ret
return self._errors
ret = RelationsList() ret = RelationsList()
errors = [] errors = []
update = self.object is not None update = self.object is not None
@ -527,7 +536,8 @@ class BaseSerializer(WritableField):
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': ['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 continue
ret.append(self.from_native(item, None)) ret.append(self.from_native(item, None))
@ -539,8 +549,6 @@ class BaseSerializer(WritableField):
self._errors = any(errors) and errors or [] self._errors = any(errors) and errors or []
else: else:
self._errors = {'non_field_errors': ['Expected a list of items.']} self._errors = {'non_field_errors': ['Expected a list of items.']}
else:
ret = self.from_native(data, files)
if not self._errors: if not self._errors:
self.object = ret self.object = ret