Use None to delete nested object as opposed to _delete flag

rest_framework/serializers.py

@@ -107,7 +107,6 @@ class BaseSerializer(WritableField):
         self.parent = None
         self.root = None
         self.partial = partial
-        self.delete = False
 
         self.context = context or {}
 
@@ -119,6 +118,7 @@ class BaseSerializer(WritableField):
         self._data = None
         self._files = None
         self._errors = None
+        self._delete = False
 
     #####
     # Methods to determine which fields to use when (de)serializing objects.
@@ -378,7 +378,7 @@ class ModelSerializer(Serializer):
             return
 
         try:
-            native = data[field_name]
+            value = data[field_name]
         except KeyError:
             if self.required:
                 raise ValidationError(self.error_messages['required'])
@@ -387,13 +387,14 @@ class ModelSerializer(Serializer):
         if self.parent.object:
             # Set the serializer object if it exists
             pk_field_name = self.opts.model._meta.pk.name
-            pk_val = native.get(pk_field_name)
             obj = getattr(self.parent.object, field_name)
-            if obj and (getattr(obj, pk_field_name) == pk_val):
             self.object = obj
-                self.delete = native.get('_delete')
 
-        obj = self.from_native(native, files)
+        if value in (None, ''):
+            self._delete = True
+            into[(self.source or field_name)] = self
+        else:
+            obj = self.from_native(value, files)
             if not self._errors:
                 self.object = obj
                 into[self.source or field_name] = self
@@ -575,7 +576,7 @@ class ModelSerializer(Serializer):
         return instance
 
     def _save(self, parent=None, fk_field=None):
-        if self.delete:
+        if self._delete:
             self.object.delete()
             return
 

rest_framework/tests/nesting.py

@@ -106,7 +106,7 @@ class NestedOneToOneTests(TestCase):
         self.assertEquals(serializer.data, expected)
 
     def test_one_to_one_delete(self):
-        data = {'id': 3, 'name': u'target-3', 'target_source': {'_delete': True, 'id': 3, 'name': u'target-source-3', 'source': {'id': 3, 'name': u'source-3'}}}
+        data = {'id': 3, 'name': u'target-3', 'target_source': None}
         instance = OneToOneTarget.objects.get(pk=3)
         serializer = OneToOneTargetSerializer(instance, data=data)
         self.assertTrue(serializer.is_valid())