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

Merge pull request #43 from sebpiq/master

Browse Source 
Corrected bug in serializers
This commit is contained in:
Tom Christie 2011-07-05 02:48:05 -07:00
commit 3b2e70dd3a
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,
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):
@ -228,7 +228,10 @@ class Serializer(object):
# serialize each required field
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
meth = getattr(self, fname)
if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2:
@ -236,9 +239,6 @@ class Serializer(object):
elif hasattr(instance, smart_str(fname)):
# now check for an attribute 'fname' on the instance
obj = getattr(instance, fname)
elif fname in instance:
# finally check for a key 'fname' on the instance
obj = instance[fname]
else:
continue