aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2015-01-05 15:04:23 +0000
committerTom Christie2015-01-05 15:04:23 +0000
commit949e3b7507ee4e7b0c571cb6a7eba076dee91a38 (patch)
treedadb26c5c8c40b2aaafad85608470e50c10c1370 /rest_framework/serializers.py
parent49dc037a961b618baf8eb189b094633238867b41 (diff)
parent6fd33ddea9e5b8f9e979e573a27873131846ea48 (diff)
downloaddjango-rest-framework-949e3b7507ee4e7b0c571cb6a7eba076dee91a38.tar.bz2
Merge branch 'master' into version-3.1
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 08a58433..d1bd3ec3 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -421,8 +421,14 @@ class Serializer(BaseSerializer):
fields = [field for field in self.fields.values() if not field.write_only]
for field in fields:
- attribute = field.get_attribute(instance)
+ try:
+ attribute = field.get_attribute(instance)
+ except SkipField:
+ continue
+
if attribute is None:
+ # We skip `to_representation` for `None` values so that
+ # fields do not have to explicitly deal with that case.
ret[field.field_name] = None
else:
ret[field.field_name] = field.to_representation(attribute)