diff options
| author | Tom Christie | 2013-03-18 01:00:17 -0700 |
|---|---|---|
| committer | Tom Christie | 2013-03-18 01:00:17 -0700 |
| commit | 75fbfb585861dd5bb3ace62b0673b84e80fb537b (patch) | |
| tree | f50221bb01a02aa1b744e12a71eaf92dbecc342d /rest_framework | |
| parent | ee20cf806b865a90517dd173cbffbe0286d52dab (diff) | |
| parent | 101fa26ebc092a43acbf3f28617eb58be7629b5f (diff) | |
| download | django-rest-framework-75fbfb585861dd5bb3ace62b0673b84e80fb537b.tar.bz2 | |
Merge pull request #739 from craigds/basic-nested-serialization
tweaks to writable nested serializers
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/serializers.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 21336dc2..a81cbc29 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -129,8 +129,8 @@ class BaseSerializer(WritableField): _dict_class = SortedDictWithMetadata def __init__(self, instance=None, data=None, files=None, - context=None, partial=False, many=None, source=None): - super(BaseSerializer, self).__init__(source=source) + context=None, partial=False, many=None, **kwargs): + super(BaseSerializer, self).__init__(**kwargs) self.opts = self._options_class(self.Meta) self.parent = None self.root = None @@ -358,9 +358,13 @@ class BaseSerializer(WritableField): try: value = data[field_name] except KeyError: - if self.required: - raise ValidationError(self.error_messages['required']) - return + if self.default is not None and not self.partial: + # Note: partial updates shouldn't set defaults + value = copy.deepcopy(self.default) + else: + if self.required: + raise ValidationError(self.error_messages['required']) + return # Set the serializer object if it exists obj = getattr(self.parent.object, field_name) if self.parent.object else None |
