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

Merge pull request #92 from mwesterhof/master

Browse Source 
Serializer.serialize_model fix of uncaught _SkipField exceptions
This commit is contained in:
Marko Tibold 2011-12-13 04:06:40 -08:00
commit 4f38e78580
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
djangorestframework/serializer.py
View File

@ -229,6 +229,7 @@ class Serializer(object):
# serialize each required field # serialize each required field
for fname in fields: for fname in fields:
try:
if hasattr(self, smart_str(fname)): if hasattr(self, smart_str(fname)):
# check first for a method 'fname' on self first # check first for a method 'fname' on self first
meth = getattr(self, fname) meth = getattr(self, fname)
@ -243,7 +244,6 @@ class Serializer(object):
else: else:
continue continue
try:
key = self.serialize_key(fname) key = self.serialize_key(fname)
val = self.serialize_val(fname, obj) val = self.serialize_val(fname, obj)
data[key] = val data[key] = val