Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
efe2c373
Commit
efe2c373
authored
Jan 11, 2016
by
Xavier Ordoquy
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3809 from areski/fix-timefield
Fixed TimeField not handling empty values
parents
edd9c7de
4e017963
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
rest_framework/fields.py
+2
-0
tests/test_fields.py
+1
-0
No files found.
rest_framework/fields.py
View file @
efe2c373
...
@@ -1204,6 +1204,8 @@ class TimeField(Field):
...
@@ -1204,6 +1204,8 @@ class TimeField(Field):
)
)
if
output_format
.
lower
()
==
ISO_8601
:
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
.
isoformat
()
return
value
.
strftime
(
output_format
)
return
value
.
strftime
(
output_format
)
...
...
tests/test_fields.py
View file @
efe2c373
...
@@ -1032,6 +1032,7 @@ class TestTimeField(FieldValues):
...
@@ -1032,6 +1032,7 @@ class TestTimeField(FieldValues):
}
}
outputs
=
{
outputs
=
{
datetime
.
time
(
13
,
00
):
'13:00:00'
,
datetime
.
time
(
13
,
00
):
'13:00:00'
,
'00:00:00'
:
'00:00:00'
,
None
:
None
,
None
:
None
,
''
:
None
,
''
:
None
,
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment