Merge pull request #3809 from areski/fix-timefield

xordoquy · xordoquy · commit efe2c3739d62 · 2016-01-11T12:28:28.000+01:00
Fixed TimeField not handling empty values
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1204,6 +1204,8 @@ def to_representation(self, value):
         )
 
         if output_format.lower() == ISO_8601:
+            if isinstance(value, six.string_types):
+                value = datetime.datetime.strptime(value, '%H:%M:%S').time()
             return value.isoformat()
         return value.strftime(output_format)
 
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -1032,6 +1032,7 @@ class TestTimeField(FieldValues):
     }
     outputs = {
         datetime.time(13, 00): '13:00:00',
+        '00:00:00': '00:00:00',
         None: None,
         '': None,
     }

Original file line number	Diff line number	Diff line change
`@@ -1204,6 +1204,8 @@ def to_representation(self, value):`
`1204`	`1204`	`)`
`1205`	`1205`
`1206`	`1206`	`if output_format.lower() == ISO_8601:`
	`1207`	`+ if isinstance(value, six.string_types):`
	`1208`	`+ value = datetime.datetime.strptime(value, '%H:%M:%S').time()`
`1207`	`1209`	`return value.isoformat()`
`1208`	`1210`	`return value.strftime(output_format)`
`1209`	`1211`
Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,7 @@ class TestTimeField(FieldValues):`
`1032`	`1032`	`}`
`1033`	`1033`	`outputs = {`
`1034`	`1034`	`datetime.time(13, 00): '13:00:00',`
	`1035`	`+ '00:00:00': '00:00:00',`
`1035`	`1036`	`None: None,`
`1036`	`1037`	`'': None,`
`1037`	`1038`	`}`