encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 11:30:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue #1130: SerializerMethodField now must receive and object or return None

Browse Source
This commit is contained in:
Jesús Espino 2013-10-10 10:22:16 +02:00
parent 0bbc775b95
commit 29f3f05a45
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -979,5 +979,7 @@ class SerializerMethodField(Field):
super(SerializerMethodField, self).__init__() super(SerializerMethodField, self).__init__()
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name):
value = getattr(self.parent, self.method_name)(obj) if obj is not None:
return self.to_native(value) value = getattr(self.parent, self.method_name)(obj)
return self.to_native(value)
return None