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

Merge 929937693c into 2621e03aa3

Browse Source
This commit is contained in:
Daniel Hahler 2018-04-04 10:32:44 +00:00 committed by GitHub
commit 58eeec7982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/serializers.py
View File

@ -498,6 +498,13 @@ class Serializer(BaseSerializer):
# resolve the pk value. # resolve the pk value.
check_for_none = attribute.pk if isinstance(attribute, PKOnlyObject) else attribute check_for_none = attribute.pk if isinstance(attribute, PKOnlyObject) else attribute
if check_for_none is None: if check_for_none is None:
if not field.allow_null:
try:
ret[field.field_name] = field.get_default()
except SkipField:
pass
else:
continue
ret[field.field_name] = None ret[field.field_name] = None
else: else:
ret[field.field_name] = field.to_representation(attribute) ret[field.field_name] = field.to_representation(attribute)