From 5d6962825015b3d68826584c50739750d9b3c5c5 Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 5 Nov 2012 20:55:03 +0100 Subject: [PATCH] Update rest_framework/serializers.py fixed AttributeError in case restore_object is overwritten without explicitly setting self.m2m_data --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 28767b16b..4f68ada68 100644 --- a/rest_framework/serializers.py +++ b/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 = {}