p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.8.x] Added missing return value to DurationField.prepare_value(); refs #24339. 

Backport of 49647bec6e from master
This commit is contained in:
Michael Angeletti 2015-02-14 16:33:09 -05:00 committed by Tim Graham
parent 87e9cad4a4
commit e13dca859c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/forms/fields.py
View File

@ -528,6 +528,7 @@ class DurationField(Field):
def prepare_value(self, value):
if isinstance(value, datetime.timedelta):
return duration_string(value)
return value
def to_python(self, value):
if value in self.empty_values:

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

@ -640,6 +640,7 @@ class FieldsTests(SimpleTestCase):
field = DurationField()
td = datetime.timedelta(minutes=15, seconds=30)
self.assertEqual(field.prepare_value(td), duration_string(td))
self.assertEqual(field.prepare_value('arbitrary'), 'arbitrary')
self.assertIsNone(field.prepare_value(None))
# RegexField ##################################################################