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

Merge 29f3f05a45 into f18158358d

Browse Source
This commit is contained in:
Jesús Espino 2013-10-10 09:37:59 -07:00
commit 85baca9ce7
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

@ -1003,5 +1003,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