Merge 29edb72659 into 836e49b535

rest_framework/fields.py

@@ -101,7 +101,10 @@ def get_attribute(instance, attrs):
             if isinstance(instance, collections.Mapping):
                 instance = instance[attr]
             else:
-                instance = getattr(instance, attr)
+                try:
+                    instance = getattr(instance, attr)
+                except KeyError as exc:
+                    raise ValueError('Exception raised in property attribute "{0}"; original exception was: {1}'.format(attr, exc))
         except ObjectDoesNotExist:
             return None
         if is_simple_callable(instance):

tests/test_serializer.py

@@ -344,6 +344,23 @@ class TestUnicodeRepr:
 
 
 class TestNotRequiredOutput:
+    def test_not_required_property_exception(self):
+        """
+        A KeyError should propogate when it is thrown in a property attribute.
+        """
+        class ExampleSerializer(serializers.Serializer):
+            raises_key_error = serializers.CharField(required=False)
+
+        class ExampleObject:
+            @property
+            def raises_key_error(self):
+                raise KeyError()
+
+        instance = ExampleObject()
+        serializer = ExampleSerializer(instance)
+        with pytest.raises(ValueError):
+            serializer.data
+
     def test_not_required_output_for_dict(self):
         """
         'required=False' should allow a dictionary key to be missing in output.