encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 03:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #739 from craigds/basic-nested-serialization

Browse Source 
tweaks to writable nested serializers
This commit is contained in:
Tom Christie 2013-03-18 01:00:17 -07:00
commit 75fbfb5858
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rest_framework/serializers.py
View File

@ -129,8 +129,8 @@ class BaseSerializer(WritableField):
_dict_class = SortedDictWithMetadata _dict_class = SortedDictWithMetadata
def __init__(self, instance=None, data=None, files=None, def __init__(self, instance=None, data=None, files=None,
context=None, partial=False, many=None, source=None): context=None, partial=False, many=None, **kwargs):
super(BaseSerializer, self).__init__(source=source) super(BaseSerializer, self).__init__(**kwargs)
self.opts = self._options_class(self.Meta) self.opts = self._options_class(self.Meta)
self.parent = None self.parent = None
self.root = None self.root = None
@ -358,9 +358,13 @@ class BaseSerializer(WritableField):
try: try:
value = data[field_name] value = data[field_name]
except KeyError: except KeyError:
if self.required: if self.default is not None and not self.partial:
raise ValidationError(self.error_messages['required']) # Note: partial updates shouldn't set defaults
return value = copy.deepcopy(self.default)
else:
if self.required:
raise ValidationError(self.error_messages['required'])
return
# Set the serializer object if it exists # Set the serializer object if it exists
obj = getattr(self.parent.object, field_name) if self.parent.object else None obj = getattr(self.parent.object, field_name) if self.parent.object else None