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

Merge 3161475562 into 2dc042f0cf

Browse Source
This commit is contained in:
GitHub Merge Button 2011-07-04 01:36:29 -07:00
commit 4887ac9495
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
djangorestframework/serializer.py
View File

@ -177,7 +177,7 @@ class Serializer(object):
Keys serialize to their string value, Keys serialize to their string value,
unless they exist in the `rename` dict. unless they exist in the `rename` dict.
""" """
return getattr(self.rename, smart_str(key), smart_str(key)) return self.rename.get(smart_str(key), smart_str(key))
def serialize_val(self, key, obj): def serialize_val(self, key, obj):
@ -228,7 +228,10 @@ class Serializer(object):
# serialize each required field # serialize each required field
for fname in fields: for fname in fields:
if hasattr(self, smart_str(fname)): if fname in instance:
# finally check for a key 'fname' on the instance
obj = instance[fname]
elif hasattr(self, smart_str(fname)):
# check for a method 'fname' on self first # 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:
@ -236,9 +239,6 @@ class Serializer(object):
elif hasattr(instance, smart_str(fname)): elif hasattr(instance, smart_str(fname)):
# now check for an attribute 'fname' on the instance # now check for an attribute 'fname' on the instance
obj = getattr(instance, fname) obj = getattr(instance, fname)
elif fname in instance:
# finally check for a key 'fname' on the instance
obj = instance[fname]
else: else:
continue continue