From 54a19105f051113085efe9f87783acb77127c1d1 Mon Sep 17 00:00:00 2001
From: Alen Mujezinovic
Date: Thu, 1 Mar 2012 12:46:38 +0000
Subject: Maintain a reference to the parent serializer when descending down
 into fields

---
 djangorestframework/serializer.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'djangorestframework/serializer.py')

diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index 5dea37e8..e2d860a2 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -133,6 +133,7 @@ class Serializer(object):
         if isinstance(info, (list, tuple)):
             class OnTheFlySerializer(self.__class__):
                 fields = info
+                parent = getattr(self, 'parent', self)
             return OnTheFlySerializer
 
         # If an element in `fields` is a 2-tuple of (str, Serializer)
-- 
cgit v1.2.3


From 0a57cf98766ebbf22900024608faefbca3bdde6b Mon Sep 17 00:00:00 2001
From: Alen Mujezinovic
Date: Thu, 1 Mar 2012 12:51:23 +0000
Subject: Added a .parent attribute to the Serializer object for documentation
 purposes

---
 djangorestframework/serializer.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'djangorestframework/serializer.py')

diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index e2d860a2..f30667f1 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -96,6 +96,11 @@ class Serializer(object):
     """
     The maximum depth to serialize to, or `None`.
     """
+    
+    parent = None
+    """
+    A reference to the root serializer when descending down into fields.
+    """
 
     def __init__(self, depth=None, stack=[], **kwargs):
         if depth is not None:
-- 
cgit v1.2.3


From 537fa19bacd97743555b3cac2a3e3c6e14786124 Mon Sep 17 00:00:00 2001
From: Alen Mujezinovic
Date: Thu, 1 Mar 2012 13:17:29 +0000
Subject: Whoops. Adding the .parent attribute to the Serializer class broke
 getattr(self,'parent',self). This fixes it.

---
 djangorestframework/serializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'djangorestframework/serializer.py')

diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index f30667f1..d000ad96 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -138,7 +138,7 @@ class Serializer(object):
         if isinstance(info, (list, tuple)):
             class OnTheFlySerializer(self.__class__):
                 fields = info
-                parent = getattr(self, 'parent', self)
+                parent = getattr(self, 'parent') or self
             return OnTheFlySerializer
 
         # If an element in `fields` is a 2-tuple of (str, Serializer)
-- 
cgit v1.2.3


From 2f9775c12d172199c2a915062bfba3a13f5cadc4 Mon Sep 17 00:00:00 2001
From: Alen Mujezinovic
Date: Mon, 13 Aug 2012 15:58:23 +0100
Subject: Don't ever return the normal serializer again.

---
 djangorestframework/serializer.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'djangorestframework/serializer.py')

diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index d000ad96..f2f89f6c 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -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):
         """
-- 
cgit v1.2.3