From d31c12c21d7fadfd707ae8c4934d99259bf7c12b Mon Sep 17 00:00:00 2001
From: Federico Capoano <nemesis@ninux.org>
Date: Thu, 20 Mar 2014 11:26:32 +0100
Subject: [PATCH] fix non_native_fields behaviour non_native_fields assumed to
 be only in ModelSerializer

---
 rest_framework/serializers.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 rest_framework/serializers.py

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
old mode 100644
new mode 100755
index b17f71af8..e6cdb0dc2
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -346,13 +346,16 @@ class BaseSerializer(WritableField):
                continue
             field.initialize(parent=self, field_name=field_name)
             key = self.get_field_key(field_name)
+            
             try:
                 value = field.field_to_native(obj, field_name)
-            except AttributeError:
-                if field_name in self.opts.non_native_fields:
+            except AttributeError as e:
+                # non_native_fields check is done only in ModelSerializer
+                if field_name in getattr(self.opts, 'non_native_fields', []):
                     continue
                 else:
-                    raise
+                    raise e
+                
             method = getattr(self, 'transform_%s' % field_name, None)
             if callable(method):
                 value = method(obj, value)
@@ -392,9 +395,6 @@ class BaseSerializer(WritableField):
         Override default so that the serializer can be used as a nested field
         across relationships.
         """
-        if field_name in self.opts.non_native_fields:
-            return None
-
         if self.write_only:
             return None
 
@@ -907,6 +907,15 @@ class ModelSerializer(Serializer):
                 and not isinstance(field, Serializer):
                 exclusions.remove(field_name)
         return exclusions
+    
+    def field_to_native(self, obj, field_name):
+        """
+        Add support to non_native_fields
+        """
+        if field_name in self.opts.non_native_fields:
+            return None
+        
+        return super(ModelSerializer, self).field_to_native(obj, field_name)
 
     def full_clean(self, instance):
         """