diff options
Diffstat (limited to 'django/utils/dateparse.py')
| -rw-r--r-- | django/utils/dateparse.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py index ffb37afcdf..e0e5e244c7 100644 --- a/django/utils/dateparse.py +++ b/django/utils/dateparse.py @@ -131,9 +131,11 @@ def parse_duration(value): Also supports ISO 8601 representation and PostgreSQL's day-time interval format. """ - match = standard_duration_re.match(value) - if not match: - match = iso8601_duration_re.match(value) or postgres_interval_re.match(value) + match = ( + standard_duration_re.match(value) or + iso8601_duration_re.match(value) or + postgres_interval_re.match(value) + ) if match: kw = match.groupdict() days = datetime.timedelta(float(kw.pop('days', 0) or 0)) |