Pass through strings as-in with DateTimeField (#4196)

tomchristie · web-flow · commit 9406e45b2cb1 · 2016-06-14T12:23:39.000+01:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1073,7 +1073,7 @@ def to_representation(self, value):
 
         output_format = getattr(self, 'format', api_settings.DATETIME_FORMAT)
 
-        if output_format is None:
+        if output_format is None or isinstance(value, six.string_types):
             return value
 
         if output_format.lower() == ISO_8601:
@@ -1133,7 +1133,7 @@ def to_representation(self, value):
 
         output_format = getattr(self, 'format', api_settings.DATE_FORMAT)
 
-        if output_format is None:
+        if output_format is None or isinstance(value, six.string_types):
             return value
 
         # Applying a `DateField` to a datetime value is almost always
@@ -1146,8 +1146,6 @@ def to_representation(self, value):
         )
 
         if output_format.lower() == ISO_8601:
-            if isinstance(value, six.string_types):
-                value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
             return value.isoformat()
 
         return value.strftime(output_format)
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -993,6 +993,8 @@ class TestDateTimeField(FieldValues):
     outputs = {
         datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00',
         datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z',
+        '2001-01-01T00:00:00': '2001-01-01T00:00:00',
+        six.text_type('2016-01-10T00:00:00'): '2016-01-10T00:00:00',
         None: None,
         '': None,
     }

Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,8 @@ class TestDateTimeField(FieldValues):`
`993`	`993`	`outputs = {`
`994`	`994`	`datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00',`
`995`	`995`	`datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z',`
	`996`	`+ '2001-01-01T00:00:00': '2001-01-01T00:00:00',`
	`997`	`+ six.text_type('2016-01-10T00:00:00'): '2016-01-10T00:00:00',`
`996`	`998`	`None: None,`
`997`	`999`	`'': None,`
`998`	`1000`	`}`