aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2014-11-07 14:14:18 +0000
committerTom Christie2014-11-07 14:14:18 +0000
commit4e2627736f3cc3814c08dd7132cbd5efa63c2670 (patch)
treedf6f234b8d7bed6e967ba7dd13f66dd447d40980 /rest_framework/serializers.py
parent041435f4eeee80fbc805154977140cf42335c954 (diff)
parent1c1c6640d229e1380742dd073302a3650a10a40a (diff)
downloaddjango-rest-framework-4e2627736f3cc3814c08dd7132cbd5efa63c2670.tar.bz2
Merge branch 'master' into dont-deserialize-twice
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index b00f9b7a..833a4e48 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -230,7 +230,11 @@ class Serializer(BaseSerializer):
def get_initial(self):
if self._initial_data is not None:
- return self.to_representation(self._initial_data)
+ return ReturnDict([
+ (field_name, field.get_value(self._initial_data))
+ for field_name, field in self.fields.items()
+ if field.get_value(self._initial_data) is not empty
+ ], serializer=self)
return ReturnDict([
(field.field_name, field.get_initial())