diff options
Diffstat (limited to 'django/utils/dateparse.py')
| -rw-r--r-- | django/utils/dateparse.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py index d142e161b6..535655561c 100644 --- a/django/utils/dateparse.py +++ b/django/utils/dateparse.py @@ -137,11 +137,11 @@ def parse_duration(value): ) if match: kw = match.groupdict() - days = datetime.timedelta(float(kw.pop('days', 0) or 0)) sign = -1 if kw.pop('sign', '+') == '-' else 1 if kw.get('microseconds'): kw['microseconds'] = kw['microseconds'].ljust(6, '0') if kw.get('seconds') and kw.get('microseconds') and kw['seconds'].startswith('-'): kw['microseconds'] = '-' + kw['microseconds'] - kw = {k: float(v) for k, v in kw.items() if v is not None} + kw = {k: float(v.replace(',', '.')) for k, v in kw.items() if v is not None} + days = datetime.timedelta(kw.pop('days', .0) or .0) return days + sign * datetime.timedelta(**kw) |