encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 05:20:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge a8711f6ab2 into 4495ac466d

Browse Source
This commit is contained in:
dgreisen-cfpb 2014-04-08 07:29:58 +00:00
commit 7e9779c3a8
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/fields.py
View File

@ -180,7 +180,7 @@ class Field(object):
""" """
return return
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name, *args, **kwargs):
""" """
Given and object and a field name, returns the value that should be Given and object and a field name, returns the value that should be
serialized for that field. serialized for that field.
@ -328,10 +328,10 @@ class WritableField(Field):
if errors: if errors:
raise ValidationError(errors) raise ValidationError(errors)
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name, *args, **kwargs):
if self.write_only: if self.write_only:
return None return None
return super(WritableField, self).field_to_native(obj, field_name) return super(WritableField, self).field_to_native(obj, field_name, *args, **kwargs)
def field_from_native(self, data, files, field_name, into): def field_from_native(self, data, files, field_name, into):
""" """
@ -413,7 +413,7 @@ class ModelField(WritableField):
else: else:
return self.model_field.to_python(value) return self.model_field.to_python(value)
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name, *args, **kwargs):
value = self.model_field._get_val_from_obj(obj) value = self.model_field._get_val_from_obj(obj)
if is_protected_type(value): if is_protected_type(value):
return value return value
@ -1022,6 +1022,6 @@ class SerializerMethodField(Field):
self.method_name = method_name self.method_name = method_name
super(SerializerMethodField, self).__init__() super(SerializerMethodField, self).__init__()
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name, *args, **kwargs):
value = getattr(self.parent, self.method_name)(obj) value = getattr(self.parent, self.method_name)(obj, *args, **kwargs)
return self.to_native(value) return self.to_native(value)

31
rest_framework/serializers.py
View File

@ -334,7 +334,22 @@ class BaseSerializer(WritableField):
return instance return instance
return attrs return attrs
def to_native(self, obj): def _skip_field(self, obj, field_name, field, *args, **kwargs):
""" Whether to skip serializing the field; return True to skip"""
return field.read_only and obj is None
def _get_field_value(self, obj, field_name, field, *args, **kwargs):
"""
call subfield's field_to_native. First try with args and kwargs,
fallback to without for serializers/fields without support.
"""
try:
value = field.field_to_native(obj, field_name, *args, **kwargs)
except TypeError:
value = field.field_to_native(obj, field_name)
return value
def to_native(self, obj, *args, **kwargs):
""" """
Serialize objects -> primitives. Serialize objects -> primitives.
""" """
@ -342,11 +357,11 @@ class BaseSerializer(WritableField):
ret.fields = self._dict_class() ret.fields = self._dict_class()
for field_name, field in self.fields.items(): for field_name, field in self.fields.items():
if field.read_only and obj is None: if self._skip_field(obj, field_name, field, *args, **kwargs):
continue continue
field.initialize(parent=self, field_name=field_name) field.initialize(parent=self, field_name=field_name)
key = self.get_field_key(field_name) key = self.get_field_key(field_name)
value = field.field_to_native(obj, field_name) value = self._get_field_value(obj, field_name, field, *args, **kwargs)
method = getattr(self, 'transform_%s' % field_name, None) method = getattr(self, 'transform_%s' % field_name, None)
if callable(method): if callable(method):
value = method(obj, value) value = method(obj, value)
@ -381,7 +396,7 @@ class BaseSerializer(WritableField):
field.label = pretty_name(key) field.label = pretty_name(key)
return field return field
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name, *args, **kwargs):
""" """
Override default so that the serializer can be used as a nested field Override default so that the serializer can be used as a nested field
across relationships. across relationships.
@ -390,7 +405,7 @@ class BaseSerializer(WritableField):
return None return None
if self.source == '*': if self.source == '*':
return self.to_native(obj) return self.to_native(obj, *args, **kwargs)
# Get the raw field value # Get the raw field value
try: try:
@ -405,7 +420,7 @@ class BaseSerializer(WritableField):
return None return None
if is_simple_callable(getattr(value, 'all', None)): if is_simple_callable(getattr(value, 'all', None)):
return [self.to_native(item) for item in value.all()] return [self.to_native(item, *args, **kwargs) for item in value.all()]
if value is None: if value is None:
return None return None
@ -416,8 +431,8 @@ class BaseSerializer(WritableField):
many = hasattr(value, '__iter__') and not isinstance(value, (Page, dict, six.text_type)) many = hasattr(value, '__iter__') and not isinstance(value, (Page, dict, six.text_type))
if many: if many:
return [self.to_native(item) for item in value] return [self.to_native(item, *args, **kwargs) for item in value]
return self.to_native(value) return self.to_native(value, *args, **kwargs)
def field_from_native(self, data, files, field_name, into): def field_from_native(self, data, files, field_name, into):
""" """