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 3a8752d8ab into 2fa04caf7c

Browse Source
This commit is contained in:
Anthony Monthe 2018-01-31 18:19:07 +00:00 committed by GitHub
commit b27e9cbea0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/serializers.py
View File

@ -479,6 +479,16 @@ class Serializer(BaseSerializer):
return ret
def check_for_none(self, attribute):
# We skip `to_representation` for `None` values so that fields do
# not have to explicitly deal with that case.
#
# For related fields with `use_pk_only_optimization` we need to
# resolve the pk value.
if isinstance(attribute, PKOnlyObject):
return attribute.pk
return attribute
def to_representation(self, instance):
"""
Object instance -> Dict of primitive datatypes.
@ -492,13 +502,7 @@ class Serializer(BaseSerializer):
except SkipField:
continue
# We skip `to_representation` for `None` values so that fields do
# not have to explicitly deal with that case.
#
# For related fields with `use_pk_only_optimization` we need to
# resolve the pk value.
check_for_none = attribute.pk if isinstance(attribute, PKOnlyObject) else attribute
if check_for_none is None:
if self.check_for_none(attribute) is None:
ret[field.field_name] = None
else:
ret[field.field_name] = field.to_representation(attribute)