From 0bd2f89b8dc497f17d5fafdf7f533c4319e8c12a Mon Sep 17 00:00:00 2001 From: Tomi Pajunen Date: Tue, 13 Nov 2012 16:16:17 +0200 Subject: [PATCH] Possible solution and test case updated --- rest_framework/fields.py | 5 ++--- rest_framework/tests/serializer.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 4c2064261..7bed4ab87 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -351,9 +351,8 @@ class ManyRelatedMixin(object): except: # Non-form data value = data.get(self.source or field_name) - else: - if value == ['']: - value = [] + if value == [''] or value is None: + value = [] into[field_name] = [self.from_native(item) for item in value] diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py index 7d750b813..38117b36c 100644 --- a/rest_framework/tests/serializer.py +++ b/rest_framework/tests/serializer.py @@ -342,11 +342,10 @@ class ManyToManyTests(TestCase): serializer = self.serializer_class(data=data) self.assertEqual(serializer.is_valid(), True) instance = serializer.save() - self.assertEquals(len(ManyToManyModel.objects.all()), 3) - self.assertEquals(instance.pk, 3) + self.assertEquals(len(ManyToManyModel.objects.all()), 2) + self.assertEquals(instance.pk, 2) self.assertEquals(list(instance.rel.all()), []) - def test_create_empty_relationship_flat_data(self): """ Create an instance of a model with a ManyToMany relationship,