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

Don't ever return the normal serializer again.

Browse Source
This commit is contained in:
Alen Mujezinovic 2012-08-13 15:58:23 +01:00
parent e3d7c36105
commit 2f9775c12d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
djangorestframework/serializer.py
View File

@ -135,10 +135,12 @@ class Serializer(object):
# If an element in `fields` is a 2-tuple of (str, tuple)
# then the second element of the tuple is the fields to
# set on the related serializer
class OnTheFlySerializer(self.__class__):
fields = info
parent = getattr(self, 'parent') or self
if isinstance(info, (list, tuple)):
class OnTheFlySerializer(self.__class__):
fields = info
parent = getattr(self, 'parent') or self
return OnTheFlySerializer
# If an element in `fields` is a 2-tuple of (str, Serializer)
@ -156,8 +158,9 @@ class Serializer(object):
elif isinstance(info, str) and info in _serializers:
return _serializers[info]
# Otherwise use `related_serializer` or fall back to `Serializer`
return getattr(self, 'related_serializer') or Serializer
# Otherwise use `related_serializer` or fall back to
# `OnTheFlySerializer` preserve custom serialization methods.
return getattr(self, 'related_serializer') or OnTheFlySerializer
def serialize_key(self, key):
"""