Commit 8a21d250 authored by Michael Angeletti's avatar Michael Angeletti Committed by Tim Graham
Browse files

Fixed #24339 -- Fixed crash with empty DurationField form field.

parent 1791a7e7

django/forms/fields.py

+2 −1
Original line number Diff line number Diff line
@@ -514,6 +514,7 @@ class DurationField(Field): 
    }



    def prepare_value(self, value):

        if isinstance(value, datetime.timedelta):

            return duration_string(value)



    def to_python(self, value):

tests/forms_tests/tests/test_fields.py

+10 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ from django.test import SimpleTestCase, ignore_warnings 
from django.utils import formats, six, translation

from django.utils._os import upath

from django.utils.deprecation import RemovedInDjango20Warning

from django.utils.duration import duration_string



try:

    from PIL import Image
@@ -614,7 +615,7 @@ class FieldsTests(SimpleTestCase): 
        d = datetime.datetime(2006, 9, 17, 14, 30, 0)

        self.assertFalse(f.has_changed(d, '2006 09 17 2:30 PM'))



    # RegexField ##################################################################

    # DurationField ###########################################################



    def test_durationfield_1(self):

        f = DurationField()
@@ -642,6 +643,14 @@ class FieldsTests(SimpleTestCase): 
            str(f['duration'])

        )



    def test_durationfield_prepare_value(self):

        field = DurationField()

        td = datetime.timedelta(minutes=15, seconds=30)

        self.assertEqual(field.prepare_value(td), duration_string(td))

        self.assertIsNone(field.prepare_value(None))



    # RegexField ##################################################################



    def test_regexfield_1(self):

        f = RegexField('^[0-9][A-F][0-9]$')

        self.assertEqual('2A2', f.clean('2A2'))