Make a nested if flat

This is a possible fix for issue #73.  The problem occurs when the first
if-statement is true, but the second is not. This results into the
variable obj not being set. This commit solves it by removing that
branch.
parent e712ab0b
...@@ -230,11 +230,10 @@ class Serializer(object): ...@@ -230,11 +230,10 @@ class Serializer(object):
# serialize each required field # serialize each required field
for fname in fields: for fname in fields:
try: try:
if hasattr(self, smart_str(fname)): if inspect.ismethod(getattr(self, fname, None)) and \
len(inspect.getargspec(getattr(self, fname))[0]) == 2:
# check first for a method 'fname' on self first # check first for a method 'fname' on self first
meth = getattr(self, fname) obj = meth(instance)
if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2:
obj = meth(instance)
elif hasattr(instance, '__contains__') and fname in instance: elif hasattr(instance, '__contains__') and fname in instance:
# check for a key 'fname' on the instance # check for a key 'fname' on the instance
obj = instance[fname] obj = instance[fname]
......
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