Commit 11ee3857 by Sébastien Piquemal

fixed a bug in serializers

parent e53c3cd4
...@@ -228,16 +228,16 @@ class Serializer(object): ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment