Bring check for null fk to BaseSerializer.to_representation

carltongibson · carltongibson · commit 2ef74cfa61d6 · 2016-03-13T20:39:19.000+01:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -778,8 +778,6 @@ def to_internal_value(self, data):
         return data
 
     def to_representation(self, value):
-        if value is None:
-            return None
         if self.uuid_format == 'hex_verbose':
             return str(value)
         else:
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -464,9 +464,13 @@ def to_representation(self, 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.
+            # 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:
                 ret[field.field_name] = None
             else:
                 ret[field.field_name] = field.to_representation(attribute)
