encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-23 15:54:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

ReturnList and ReturnDict wrapped at nicer point

Browse Source
This commit is contained in:
Tom Christie 2014-11-13 23:05:44 +00:00
parent cb672a0ecb
commit 7394dcec9e
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
rest_framework/serializers.py
View File

@ -245,18 +245,18 @@ class Serializer(BaseSerializer):
def get_initial(self): def get_initial(self):
if self._initial_data is not None: if self._initial_data is not None:
return ReturnDict([ return OrderedDict([
(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 if field.get_value(self._initial_data) is not empty
and not field.read_only and not field.read_only
], serializer=self) ])
return ReturnDict([ return OrderedDict([
(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
], serializer=self) ])
def get_value(self, dictionary): def get_value(self, dictionary):
# We override the default field access in order to support # We override the default field access in order to support
@ -319,8 +319,8 @@ class Serializer(BaseSerializer):
""" """
Dict of native values <- Dict of primitive datatypes. Dict of native values <- Dict of primitive datatypes.
""" """
ret = {} ret = OrderedDict()
errors = ReturnDict(serializer=self) errors = OrderedDict()
fields = [ fields = [
field for field in self.fields.values() field for field in self.fields.values()
if (not field.read_only) or (field.default is not empty) if (not field.read_only) or (field.default is not empty)
@ -349,7 +349,7 @@ class Serializer(BaseSerializer):
""" """
Object instance -> Dict of primitive datatypes. Object instance -> Dict of primitive datatypes.
""" """
ret = ReturnDict(serializer=self) ret = OrderedDict()
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:
@ -388,6 +388,19 @@ class Serializer(BaseSerializer):
return NestedBoundField(field, value, error) return NestedBoundField(field, value, error)
return BoundField(field, value, error) return BoundField(field, value, error)
# Include a backlink to the serializer class on return objects.
# Allows renderers such as HTMLFormRenderer to get the full field info.
@property
def data(self):
ret = super(Serializer, self).data
return ReturnDict(ret, serializer=self)
@property
def errors(self):
ret = super(Serializer, self).errors
return ReturnDict(ret, serializer=self)
# There's some replication of `ListField` here, # There's some replication of `ListField` here,
# but that's probably better than obfuscating the call hierarchy. # but that's probably better than obfuscating the call hierarchy.
@ -410,7 +423,7 @@ class ListSerializer(BaseSerializer):
def get_initial(self): def get_initial(self):
if self._initial_data is not None: if self._initial_data is not None:
return self.to_representation(self._initial_data) return self.to_representation(self._initial_data)
return ReturnList(serializer=self) return []
def get_value(self, dictionary): def get_value(self, dictionary):
""" """
@ -438,7 +451,7 @@ class ListSerializer(BaseSerializer):
}) })
ret = [] ret = []
errors = ReturnList(serializer=self) errors = []
for item in data: for item in data:
try: try:
@ -459,10 +472,9 @@ class ListSerializer(BaseSerializer):
List of object instances -> List of dicts of primitive datatypes. List of object instances -> List of dicts of primitive datatypes.
""" """
iterable = data.all() if (hasattr(data, 'all')) else data iterable = data.all() if (hasattr(data, 'all')) else data
return ReturnList( return [
[self.child.to_representation(item) for item in iterable], self.child.to_representation(item) for item in iterable
serializer=self ]
)
def update(self, instance, validated_data): def update(self, instance, validated_data):
raise NotImplementedError( raise NotImplementedError(
@ -503,6 +515,21 @@ class ListSerializer(BaseSerializer):
def __repr__(self): def __repr__(self):
return representation.list_repr(self, indent=1) return representation.list_repr(self, indent=1)
# Include a backlink to the serializer class on return objects.
# Allows renderers such as HTMLFormRenderer to get the full field info.
@property
def data(self):
ret = super(ListSerializer, self).data
return ReturnList(ret, serializer=self)
@property
def errors(self):
ret = super(ListSerializer, self).errors
if isinstance(ret, dict):
return ReturnDict(ret, serializer=self)
return ReturnList(ret, serializer=self)
# ModelSerializer & HyperlinkedModelSerializer # ModelSerializer & HyperlinkedModelSerializer
# -------------------------------------------- # --------------------------------------------