Merge pull request #553 from maspwr/null-one-to-one

Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one

1 files changed, 10 insertions, 7 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 19a955b8..da0af467 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -298,15 +298,18 @@ class BaseSerializer(Field):
         Override default so that we can apply ModelSerializer as a nested
         field to relationships.
         """
-        if self.source:
-            for component in self.source.split('.'):
-                obj = getattr(obj, component)
+        try:
+            if self.source:
+                for component in self.source.split('.'):
+                    obj = getattr(obj, component)
+                    if is_simple_callable(obj):
+                        obj = obj()
+            else:
+                obj = getattr(obj, field_name)
                 if is_simple_callable(obj):
                     obj = obj()
-        else:
-            obj = getattr(obj, field_name)
-            if is_simple_callable(obj):
-                obj = value()
+        except ObjectDoesNotExist:
+            return None
 
         # If the object has an "all" method, assume it's a relationship
         if is_simple_callable(getattr(obj, 'all', None)):