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

Simplify serialization slightly

Browse Source
This commit is contained in:
Tom Christie 2014-09-26 14:32:44 +01:00
parent 8be4496586
commit 6090144608
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/fields.py
View File

@ -202,12 +202,15 @@ class Field(object):
return self.default_empty_html if (ret == '') else ret return self.default_empty_html if (ret == '') else ret
return dictionary.get(self.field_name, empty) return dictionary.get(self.field_name, empty)
def get_attribute(self, instance): def get_field_representation(self, instance):
""" """
Given the *outgoing* object instance, return the value for this field Given the outgoing object instance, return the primative value
that should be returned as a primative value. that should be used for this field.
""" """
return get_attribute(instance, self.source_attrs) attribute = get_attribute(instance, self.source_attrs)
if attribute is None:
return None
return self.to_representation(attribute)
def get_default(self): def get_default(self):
""" """

3
rest_framework/serializers.py
View File

@ -268,8 +268,7 @@ class Serializer(BaseSerializer):
fields = [field for field in self.fields.values() if not field.write_only] fields = [field for field in self.fields.values() if not field.write_only]
for field in fields: for field in fields:
native_value = field.get_attribute(instance) ret[field.field_name] = field.get_field_representation(instance)
ret[field.field_name] = field.to_representation(native_value)
return ret return ret