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

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
Next Next commit
Fixed TimeField not handling empty values
  • Loading branch information
@areski
areski committed Jan 11, 2016
commit a76c3ed051f7d8e26db82450a20cdb9f4a683116
2 changes: 2 additions & 0 deletions rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,8 @@ def to_representation(self, value):
)

if output_format.lower() == ISO_8601:
if (isinstance(value, str)):
Copy link
Contributor

@m1kola m1kola Jan 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it works ok on python 2.* with unicode values? Seems similar to #3819

Copy link
Contributor

@xordoquy xordoquy Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update str to six.string_types ? (as per #3819 indeed)

Copy link
Contributor Author

@areski areski Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I will then update both DateField & TimeField to use six.string_types

Copy link
Contributor

@xordoquy xordoquy Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@areski The DateTime was out of this PR scope and now conflict with master. Could you merge it please ?

value = datetime.datetime.strptime(value, '%H:%M:%S').time()
return value.isoformat()
return value.strftime(output_format)

Expand Down