diff options
| author | Michael Angeletti <michael@angelettigroup.com> | 2015-02-13 17:12:23 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-14 07:38:20 -0500 |
| commit | 2e6d8e51db7c469ef32c7d00ff5aa7e68237f5f1 (patch) | |
| tree | 6375afc5741151b970b726db51bf47d45d092279 /django/forms/fields.py | |
| parent | 0f3eb8260b251a15c57f577fb33baad88b284942 (diff) | |
[1.8.x] Fixed #24339 -- Fixed crash with empty DurationField form field.
Backport of 8a21d250334f56845f255be5534b01d8c6eda314 from master
Diffstat (limited to 'django/forms/fields.py')
| -rw-r--r-- | django/forms/fields.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index 7e50a39432..49b31ccc59 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -526,7 +526,8 @@ class DurationField(Field): } def prepare_value(self, value): - return duration_string(value) + if isinstance(value, datetime.timedelta): + return duration_string(value) def to_python(self, value): if value in self.empty_values: |