From 7dec01d17423a63176a4ed889a6852328c0fff40 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Thu, 22 Aug 2013 11:36:43 +1200
Subject: [PATCH] fix a bug preventing field overriding in single base
 serializer subclassing

---
 rest_framework/serializers.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index e5b5bf318..03880804a 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -106,21 +106,29 @@ def _get_declared_fields(bases, attrs):
     # If this class is subclassing another Serializer, add that Serializer's
     # fields.  Note that we loop over the bases in *reverse*. This is necessary
     # in order to maintain the correct order of fields.
+    # Note: The 'seen' dict here ensures that the fields from the 'first' base
+    # take precedence over fields from later bases.
+    # (otherwise SortedDict will squash the first-base field and
+    # use the field from a later base instead.)
+    seen = set()
+    base_fields_map = {}
+    base_fields_order = []
     for base in bases[::-1]:
         if hasattr(base, 'base_fields'):
-            fields = list(base.base_fields.items()) + fields
+            for name, field in base.base_fields.items():
+                base_fields_map[name] = field
+            base_fields_order = list(base.base_fields.keys()) + base_fields_order
 
-    # Allow overriding of fields in subclasses, by
-    # removing the superclass fields from this list.
-    # (otherwise SortedDict will squash the subclass' field and
-    # use the superclass field instead.)
-    seen = {}
-    for i, (name, field) in reversed(list(enumerate(fields))):
-        if name in seen:
-            fields.pop(seen[name])
-        seen[name] = i
+    seen = set()
+    base_fields = []
+    for name in base_fields_order:
+        if name not in seen:
+            base_fields.append((name, base_fields_map[name]))
+        seen.add(name)
 
-    return SortedDict(fields)
+    # if there are fields in both base_fields and fields, SortedDict
+    # uses the *last* one defined. So fields needs to go last.
+    return SortedDict(base_fields + fields)
 
 
 class SerializerMetaclass(type):