Merge pull request #1442 from Anton-Shutik/master

RelatedField default value handling fixed

1 files changed, 9 insertions, 1 deletions

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 163a8984..308545ce 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -119,6 +119,14 @@ class RelatedField(WritableField):
 
     choices = property(_get_choices, _set_choices)
 
+    ### Default value handling
+
+    def get_default_value(self):
+        default = super(RelatedField, self).get_default_value()
+        if self.many and default is None:
+            return []
+        return default
+
     ### Regular serializer stuff...
 
     def field_to_native(self, obj, field_name):
@@ -167,7 +175,7 @@ class RelatedField(WritableField):
         except KeyError:
             if self.partial:
                 return
-            value = [] if self.many else None
+            value = self.get_default_value()
 
         if value in self.null_values:
             if self.required: