mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #26104 -- Fixed TypeError when passing number to forms.DurationField.

Browse Source
This commit is contained in:
Alexander Gaevsky 2016-01-22 21:33:21 +02:00 committed by Tim Graham
parent 95648eb5c1
commit 956cde8004
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/fields.py
View File

@ -488,7 +488,7 @@ class DurationField(Field):
return None return None
if isinstance(value, datetime.timedelta): if isinstance(value, datetime.timedelta):
return value return value
value = parse_duration(value) value = parse_duration(force_str(value))
if value is None: if value is None:
raise ValidationError(self.error_messages['invalid'], code='invalid') raise ValidationError(self.error_messages['invalid'], code='invalid')
return value return value

4
tests/forms_tests/tests/test_fields.py
View File

@ -722,6 +722,10 @@ class FieldsTests(SimpleTestCase):
str(f['duration']) str(f['duration'])
) )
def test_durationfield_integer_value(self):
f = DurationField()
self.assertEqual(datetime.timedelta(0, 10800), f.clean(10800))
def test_durationfield_prepare_value(self): def test_durationfield_prepare_value(self):
field = DurationField() field = DurationField()
td = datetime.timedelta(minutes=15, seconds=30) td = datetime.timedelta(minutes=15, seconds=30)