DateField to_representation can handle str and empty values. Fixes en…

…code#2656, encode#2687.
ryangallen · Apr 24, 2015 · cbea03c · cbea03c
1 parent 3113e8e
commit cbea03c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
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()