Skip to content

Commit ec007a7

Browse files
committed
Merge pull request #3359 from raphaelmerx/master
DurationField accepts integers
2 parents d48ec83 + b9782b6 commit ec007a7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

rest_framework/fields.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@ def __init__(self, *args, **kwargs):
11891189
def to_internal_value(self, value):
11901190
if isinstance(value, datetime.timedelta):
11911191
return value
1192-
parsed = parse_duration(value)
1192+
parsed = parse_duration(six.text_type(value))
11931193
if parsed is not None:
11941194
return parsed
11951195
self.fail('invalid', format='[DD] [HH:[MM:]]ss[.uuuuuu]')

tests/test_fields.py

+1
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,7 @@ class TestDurationField(FieldValues):
10691069
'3 08:32:01.000123': datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123),
10701070
'08:01': datetime.timedelta(minutes=8, seconds=1),
10711071
datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123): datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123),
1072+
3600: datetime.timedelta(hours=1),
10721073
}
10731074
invalid_inputs = {
10741075
'abc': ['Duration has wrong format. Use one of these formats instead: [DD] [HH:[MM:]]ss[.uuuuuu].'],

0 commit comments

Comments
 (0)