Revert accidental merge.

1 files changed, 8 insertions, 53 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index a84370e9..27458f96 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -93,7 +93,7 @@ class SerializerOptions(object):
         self.exclude = getattr(meta, 'exclude', ())
 
 
-class BaseSerializer(WritableField):
+class BaseSerializer(Field):
     class Meta(object):
         pass
 
@@ -118,7 +118,6 @@ 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.
@@ -219,10 +218,7 @@ class BaseSerializer(WritableField):
             try:
                 field.field_from_native(data, files, field_name, reverted_data)
             except ValidationError as err:
-                if hasattr(err, 'message_dict'):
-                    self._errors[field_name] = [err.message_dict]
-                else:
-                    self._errors[field_name] = list(err.messages)
+                self._errors[field_name] = list(err.messages)
 
         return reverted_data
 
@@ -373,35 +369,6 @@ class ModelSerializer(Serializer):
     """
     _options_class = ModelSerializerOptions
 
-    def field_from_native(self, data, files, field_name, into):
-        if self.read_only:
-            return
-
-        try:
-            value = data[field_name]
-        except KeyError:
-            if self.required:
-                raise ValidationError(self.error_messages['required'])
-            return
-
-        if self.parent.object:
-            # Set the serializer object if it exists
-            pk_field_name = self.opts.model._meta.pk.name
-            obj = getattr(self.parent.object, field_name)
-            self.object = obj
-
-        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
-            else:
-                # Propagate errors up to our parent
-                raise ValidationError(self._errors)
-
     def get_default_fields(self):
         """
         Return all the fields that should be serialized for the model.
@@ -575,13 +542,10 @@ class ModelSerializer(Serializer):
 
         return instance
 
-    def _save(self, parent=None, fk_field=None):
-        if self._delete:
-            self.object.delete()
-            return
-
-        if parent and fk_field:
-            setattr(self.object, fk_field, parent)
+    def save(self):
+        """
+        Save the deserialized object and return it.
+        """
         self.object.save()
 
         if getattr(self, 'm2m_data', None):
@@ -591,18 +555,9 @@ class ModelSerializer(Serializer):
 
         if getattr(self, 'related_data', None):
             for accessor_name, object_list in self.related_data.items():
-                if isinstance(object_list, ModelSerializer):
-                    fk_field = self.object._meta.get_field_by_name(accessor_name)[0].field.name
-                    object_list._save(parent=self.object, fk_field=fk_field)
-                else:
-                    setattr(self.object, accessor_name, object_list)
+                setattr(self.object, accessor_name, object_list)
             self.related_data = {}
-            
-    def save(self):
-        """
-        Save the deserialized object and return it.
-        """
-        self._save()
+
         return self.object