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

Fields with 'allow_null=True' should imply a default serialization value (#5518)

Browse Source 
* Add test for dotted source + allow_null

* Field 'allow_null' implies 'default=None'

* Field 'allow_null' provides serialization default
This commit is contained in:
Ryan P Kilby 2017-10-30 05:17:53 -04:00 committed by Carlton Gibson
parent 1f693c331e
commit 5009aeff18
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -442,6 +442,8 @@ class Field(object):
except (KeyError, AttributeError) as exc: except (KeyError, AttributeError) as exc:
if self.default is not empty: if self.default is not empty:
return self.get_default() return self.get_default()
if self.allow_null:
return None
if not self.required: if not self.required:
raise SkipField() raise SkipField()
msg = ( msg = (

8
tests/test_serializer.py
View File

@ -449,6 +449,14 @@ class TestDefaultOutput:
assert Serializer({'nested': {'a': '3', 'b': {}}}).data == {'nested': {'a': '3', 'c': '2'}} assert Serializer({'nested': {'a': '3', 'b': {}}}).data == {'nested': {'a': '3', 'c': '2'}}
assert Serializer({'nested': {'a': '3', 'b': {'c': '4'}}}).data == {'nested': {'a': '3', 'c': '4'}} assert Serializer({'nested': {'a': '3', 'b': {'c': '4'}}}).data == {'nested': {'a': '3', 'c': '4'}}
def test_default_for_allow_null(self):
# allow_null=True should imply default=None
class Serializer(serializers.Serializer):
foo = serializers.CharField()
bar = serializers.CharField(source='foo.bar', allow_null=True)
assert Serializer({'foo': None}).data == {'foo': None, 'bar': None}
class TestCacheSerializerData: class TestCacheSerializerData:
def test_cache_serializer_data(self): def test_cache_serializer_data(self):