encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 08:29:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

multiple object updates introducing a _instance attribute to the Serializer

Browse Source
This commit is contained in:
Sebastien Beal 2012-12-29 12:01:55 +09:00
parent 2edf444051
commit 1128fe3baf
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/serializers.py
View File

@ -118,6 +118,7 @@ class BaseSerializer(Field):
self._data = None self._data = None
self._files = None self._files = None
self._errors = None self._errors = None
self._instance = instance
##### #####
# Methods to determine which fields to use when (de)serializing objects. # Methods to determine which fields to use when (de)serializing objects.
@ -276,7 +277,12 @@ class BaseSerializer(Field):
""" """
if hasattr(data, '__iter__') and not isinstance(data, dict): if hasattr(data, '__iter__') and not isinstance(data, dict):
# TODO: error data when deserializing lists # TODO: error data when deserializing lists
return [self.from_native(item, files) for item in data] objects = []
for i, item in enumerate(data):
if hasattr(self.object, '__iter__'):
self._instance = self.object[i]
objects.append(self.from_native(item, files))
return objects
self._errors = {} self._errors = {}
if data is not None or files is not None: if data is not None or files is not None:
@ -286,7 +292,7 @@ class BaseSerializer(Field):
self._errors['non_field_errors'] = ['No input provided'] self._errors['non_field_errors'] = ['No input provided']
if not self._errors: if not self._errors:
return self.restore_object(attrs, instance=getattr(self, 'object', None)) return self.restore_object(attrs, instance=getattr(self, '_instance', None))
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name):
""" """

9
rest_framework/tests/serializer.py
View File

@ -877,3 +877,12 @@ class MultipleObjectsTests(TestCase):
self.assertEquals(serializer.object, expected) self.assertEquals(serializer.object, expected)
self.assertFalse(serializer.object is expected) self.assertFalse(serializer.object is expected)
self.assertEquals(serializer.data, self.expected) self.assertEquals(serializer.data, self.expected)
def test_update(self):
serializer = CommentSerializer(instance=self.comments, data=self.data)
expected = self.comments
self.assertEquals(serializer.is_valid(), True)
self.assertEquals(serializer.object, expected)
for obj, exp in zip(serializer.object, expected):
self.assertTrue(obj is exp)
self.assertEquals(serializer.data, self.expected)