Skip to content

Fixed TimeField not handling string times. #3809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xordoquy merged 2 commits into from
Jan 11, 2016
Merged

Fixed TimeField not handling string times. #3809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76c3ed
Fixed TimeField not handling empty values
areski Jan 7, 2016
4e01796
Test for TimeField not handling empty values
areski Jan 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Test for TimeField not handling empty values
  • Loading branch information
@areski
areski committed Jan 11, 2016
commit 4e017963034502531313cba0620299ce06fc94e8
2 changes: 1 addition & 1 deletion rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ def to_representation(self, value):
)

if output_format.lower() == ISO_8601:
if (isinstance(value, str)):
if isinstance(value, six.string_types):
value = datetime.datetime.strptime(value, '%H:%M:%S').time()
return value.isoformat()
return value.strftime(output_format)
Expand Down
1 change: 1 addition & 0 deletions tests/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ class TestTimeField(FieldValues):
}
outputs = {
datetime.time(13, 00): '13:00:00',
'00:00:00': '00:00:00',
None: None,
'': None,
}
Expand Down