From 29f3f05a4552fa74c30fa01124dbe5f6e166865c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 10 Oct 2013 10:22:16 +0200 Subject: [PATCH] Fixed issue #1130: SerializerMethodField now must receive and object or return None --- rest_framework/fields.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 0c3817b57..d73f8a859 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -979,5 +979,7 @@ class SerializerMethodField(Field): super(SerializerMethodField, self).__init__() def field_to_native(self, obj, field_name): - value = getattr(self.parent, self.method_name)(obj) - return self.to_native(value) + if obj is not None: + value = getattr(self.parent, self.method_name)(obj) + return self.to_native(value) + return None