1
0
mirror of https://github.com/django/django.git synced 2025-10-29 08:36:09 +00:00

[1.8.x] Fixed #24897 -- Allowed using choices longer than 1 day with DurationField

Backport of 262d4db8c4 from master
This commit is contained in:
zauddelig
2015-06-02 11:08:41 +02:00
committed by Tim Graham
parent 9d83de8ff3
commit 7f92b6e576
3 changed files with 18 additions and 1 deletions

View File

@@ -29,7 +29,7 @@ datetime_re = re.compile(
standard_duration_re = re.compile(
r'^'
r'(?:(?P<days>-?\d+) )?'
r'(?:(?P<days>-?\d+) (days?, )?)?'
r'((?:(?P<hours>\d+):)(?=\d+:\d+))?'
r'(?:(?P<minutes>\d+):)?'
r'(?P<seconds>\d+)'