encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-29 21:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug in serializers

Browse Source
This commit is contained in:
Sébastien Piquemal 2011-07-06 14:18:48 +03:00
parent e53c3cd417
commit 11ee385743
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
djangorestframework/serializer.py
View File

@ -228,16 +228,16 @@ class Serializer(object):
# serialize each required field # serialize each required field
for fname in fields: for fname in fields:
if fname in instance: if hasattr(self, smart_str(fname)):
# finally check for a key 'fname' on the instance # check first for a method 'fname' on self first
obj = instance[fname]
elif hasattr(self, smart_str(fname)):
# check for a method 'fname' on self first
meth = getattr(self, fname) meth = getattr(self, fname)
if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2: if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2:
obj = meth(instance) obj = meth(instance)
elif hasattr(instance, '__contains__') and fname in instance:
# check for a key 'fname' on the instance
obj = instance[fname]
elif hasattr(instance, smart_str(fname)): elif hasattr(instance, smart_str(fname)):
# now check for an attribute 'fname' on the instance # finally check for an attribute 'fname' on the instance
obj = getattr(instance, fname) obj = getattr(instance, fname)
else: else:
continue continue