Merge pull request #374 from tonimichel/master

Fixed AttributeError in ModelSerializer.save when ModelSerializer.restore_object is overwritten

rest_framework/serializers.py

@@ -458,7 +458,7 @@ class ModelSerializer(Serializer):
         """
         self.object.save()
 
-        if self.m2m_data and save_m2m:
+        if getattr(self, 'm2m_data', None) and save_m2m:
             for accessor_name, object_list in self.m2m_data.items():
                 setattr(self.object, accessor_name, object_list)
             self.m2m_data = {}