Simplfy TimeField passing through strings (#4197)

* Simplfy TimeField passing through strings
encode · Jun 14, 2016 · 798a971 · 798a971
1 parent 9406e45
commit 798a971
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1196,7 +1196,7 @@ def to_representation(self, value):
 
         output_format = getattr(self, 'format', api_settings.TIME_FORMAT)
 
-        if output_format is None:
+        if output_format is None or isinstance(value, six.string_types):
             return value
 
         # Applying a `TimeField` to a datetime value is almost always
@@ -1209,8 +1209,6 @@ 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)