From bdb73d558891192c96368d5ca2266327302dba54 Mon Sep 17 00:00:00 2001
From: Evan Heidtmann
Date: Thu, 26 Feb 2015 09:00:51 -0800
Subject: Avoid swallowing exceptions thrown in callable attributes

---
 rest_framework/fields.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index a5348922..01e7c78c 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -71,7 +71,11 @@ def get_attribute(instance, attrs):
         except ObjectDoesNotExist:
             return None
         if is_simple_callable(instance):
-            instance = instance()
+            try:
+                instance = instance()
+            except (AttributeError, KeyError) as exc:
+                raise ValueError('Exception raised in callable attribute "{0}"; original exception was: {1}'.format(attr, exc))
+
     return instance
 
 
-- 
cgit v1.2.3


From e6b06c34c1ee526b65c92b9071c47be2ddc668c4 Mon Sep 17 00:00:00 2001
From: Evan Heidtmann
Date: Thu, 26 Feb 2015 09:20:17 -0800
Subject: Add explanation for this exception mutation

---
 rest_framework/fields.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'rest_framework')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 01e7c78c..f2791a13 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -74,6 +74,9 @@ def get_attribute(instance, attrs):
             try:
                 instance = instance()
             except (AttributeError, KeyError) as exc:
+                # If we raised an Attribute or KeyError here it'd get treated
+                # as an omitted field in `Field.get_attribute()`. Instead we
+                # raise a ValueError to ensure the exception is not masked.
                 raise ValueError('Exception raised in callable attribute "{0}"; original exception was: {1}'.format(attr, exc))
 
     return instance
-- 
cgit v1.2.3