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

Merge 732aec2eac into 871ce34983

Browse Source
This commit is contained in:
Omer Katz 2017-05-25 10:22:32 +00:00 committed by GitHub
commit 3b62c54514
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rest_framework/serializers.py
View File

@ -108,6 +108,7 @@ class BaseSerializer(Field):
.errors - Not available. .errors - Not available.
.data - Available. .data - Available.
""" """
_dict_class = OrderedDict
def __init__(self, instance=None, data=empty, **kwargs): def __init__(self, instance=None, data=empty, **kwargs):
self.instance = instance self.instance = instance
@ -312,7 +313,7 @@ class SerializerMetaclass(type):
if field_name not in attrs if field_name not in attrs
] + fields ] + fields
return OrderedDict(fields) return attrs.get('_dict_class', OrderedDict)(fields)
def __new__(cls, name, bases, attrs): def __new__(cls, name, bases, attrs):
attrs['_declared_fields'] = cls._get_declared_fields(bases, attrs) attrs['_declared_fields'] = cls._get_declared_fields(bases, attrs)
@ -399,14 +400,14 @@ class Serializer(BaseSerializer):
def get_initial(self): def get_initial(self):
if hasattr(self, 'initial_data'): if hasattr(self, 'initial_data'):
return OrderedDict([ return self._dict_class([
(field_name, field.get_value(self.initial_data)) (field_name, field.get_value(self.initial_data))
for field_name, field in self.fields.items() for field_name, field in self.fields.items()
if (field.get_value(self.initial_data) is not empty) and if (field.get_value(self.initial_data) is not empty) and
not field.read_only not field.read_only
]) ])
return OrderedDict([ return self._dict_class([
(field.field_name, field.get_initial()) (field.field_name, field.get_initial())
for field in self.fields.values() for field in self.fields.values()
if not field.read_only if not field.read_only
@ -451,8 +452,8 @@ class Serializer(BaseSerializer):
api_settings.NON_FIELD_ERRORS_KEY: [message] api_settings.NON_FIELD_ERRORS_KEY: [message]
}, code='invalid') }, code='invalid')
ret = OrderedDict() ret = self._dict_class()
errors = OrderedDict() errors = self._dict_class()
fields = self._writable_fields fields = self._writable_fields
for field in fields: for field in fields:
@ -480,7 +481,7 @@ class Serializer(BaseSerializer):
""" """
Object instance -> Dict of primitive datatypes. Object instance -> Dict of primitive datatypes.
""" """
ret = OrderedDict() ret = self._dict_class()
fields = self._readable_fields fields = self._readable_fields
for field in fields: for field in fields:
@ -1001,7 +1002,7 @@ class ModelSerializer(Serializer):
) )
# Determine the fields that should be included on the serializer. # Determine the fields that should be included on the serializer.
fields = OrderedDict() fields = self._dict_class()
for field_name in field_names: for field_name in field_names:
# If the field is explicitly declared on the class then use that. # If the field is explicitly declared on the class then use that.