Merge pull request #2869 from ryangallen/datefield

tomchristie · tomchristie · commit abcd6f2b9ebe · 2015-05-01T16:33:43.000+01:00
DateField to_representation can handle str and empty values. Fixes #2656, #2687.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -925,6 +925,9 @@ def to_internal_value(self, value):
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
+        if not value:
+            return None
+
         if self.format is None:
             return value
 
@@ -938,7 +941,10 @@ def to_representation(self, value):
         )
 
         if self.format.lower() == ISO_8601:
+            if (isinstance(value, str)):
+                value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
             return value.isoformat()
+
         return value.strftime(self.format)
 
 
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -726,7 +726,10 @@ class TestDateField(FieldValues):
         datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'],
     }
     outputs = {
-        datetime.date(2001, 1, 1): '2001-01-01'
+        datetime.date(2001, 1, 1): '2001-01-01',
+        '2001-01-01': '2001-01-01',
+        None: None,
+        '': None,
     }
     field = serializers.DateField()
 

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,10 @@ class TestDateField(FieldValues):`
`726`	`726`	`datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'],`
`727`	`727`	`}`
`728`	`728`	`outputs = {`
`729`		`- datetime.date(2001, 1, 1): '2001-01-01'`
	`729`	`+ datetime.date(2001, 1, 1): '2001-01-01',`
	`730`	`+ '2001-01-01': '2001-01-01',`
	`731`	`+ None: None,`
	`732`	`+ '': None,`
`730`	`733`	`}`
`731`	`734`	`field = serializers.DateField()`
`732`	`735`