From 66605acaf02d46eb899f495137afb4f9ff127ff0 Mon Sep 17 00:00:00 2001
From: Ian Dash
Date: Thu, 7 Mar 2013 17:29:25 +0000
Subject: Errors during deserializing lists now return a list of tuples with
 index of bad item in data plus usual errors dict

---
 rest_framework/serializers.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ba9e9e9c..80287522 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -286,8 +286,18 @@ class BaseSerializer(Field):
         Deserialize primitives -> objects.
         """
         if hasattr(data, '__iter__') and not isinstance(data, (dict, six.text_type)):
-            # TODO: error data when deserializing lists
-            return [self.from_native(item, None) for item in data]
+            object_list = list()
+            error_list = list()
+            for count, item in enumerate(data):
+                obj = self.from_native(item, None)
+                if self._errors:
+                    error_list.append((count, self._errors))
+                object_list.append(obj)
+            if not error_list:
+                return object_list
+
+            self._errors = error_list
+            return None
 
         self._errors = {}
         if data is not None or files is not None:
@@ -354,9 +364,6 @@ class BaseSerializer(Field):
                                   'Use the `many=True` flag when instantiating the serializer.',
                                   PendingDeprecationWarning, stacklevel=3)
 
-            # TODO: error data when deserializing lists
-            if many:
-                ret = [self.from_native(item, None) for item in data]
             ret = self.from_native(data, files)
 
             if not self._errors:
-- 
cgit v1.2.3


From 68683b2ea2907f367fdff60de91656504a242a14 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 8 Mar 2013 22:19:09 +0000
Subject: Tweak implementation, and use FormSet style errors

---
 rest_framework/serializers.py | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 80287522..25790dbc 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -285,20 +285,6 @@ class BaseSerializer(Field):
         """
         Deserialize primitives -> objects.
         """
-        if hasattr(data, '__iter__') and not isinstance(data, (dict, six.text_type)):
-            object_list = list()
-            error_list = list()
-            for count, item in enumerate(data):
-                obj = self.from_native(item, None)
-                if self._errors:
-                    error_list.append((count, self._errors))
-                object_list.append(obj)
-            if not error_list:
-                return object_list
-
-            self._errors = error_list
-            return None
-
         self._errors = {}
         if data is not None or files is not None:
             attrs = self.restore_fields(data, files)
@@ -364,7 +350,15 @@ class BaseSerializer(Field):
                                   'Use the `many=True` flag when instantiating the serializer.',
                                   PendingDeprecationWarning, stacklevel=3)
 
-            ret = self.from_native(data, files)
+            if many:
+                ret = []
+                errors = []
+                for item in data:
+                    ret.append(self.from_native(item, None))
+                    errors.append(self._errors)
+                self._errors = any(errors) and errors or []
+            else:
+                ret = self.from_native(data, files)
 
             if not self._errors:
                 self.object = ret
-- 
cgit v1.2.3


From 28ae26466e1b1493feeba19480c6eb148d603330 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 8 Mar 2013 22:43:46 +0000
Subject: Py3k fixes.

---
 rest_framework/serializers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 25790dbc..106e3f17 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -7,8 +7,7 @@ from django.core.paginator import Page
 from django.db import models
 from django.forms import widgets
 from django.utils.datastructures import SortedDict
-from rest_framework.compat import get_concrete_model
-from rest_framework.compat import six
+from rest_framework.compat import get_concrete_model, six
 
 # Note: We do the following so that users of the framework can use this style:
 #
@@ -326,7 +325,7 @@ class BaseSerializer(Field):
         if self.many is not None:
             many = self.many
         else:
-            many = hasattr(obj, '__iter__') and not isinstance(obj, (Page, dict))
+            many = hasattr(obj, '__iter__') and not isinstance(obj, (Page, dict, six.text_type))
 
         if many:
             return [self.to_native(item) for item in obj]
@@ -344,7 +343,7 @@ class BaseSerializer(Field):
             if self.many is not None:
                 many = self.many
             else:
-                many = hasattr(data, '__iter__') and not isinstance(data, (Page, dict))
+                many = hasattr(data, '__iter__') and not isinstance(data, (Page, dict, six.text_type))
                 if many:
                     warnings.warn('Implict list/queryset serialization is due to be deprecated. '
                                   'Use the `many=True` flag when instantiating the serializer.',
@@ -362,6 +361,7 @@ class BaseSerializer(Field):
 
             if not self._errors:
                 self.object = ret
+
         return self._errors
 
     def is_valid(self):
-- 
cgit v1.2.3