diff options
| author | zauddelig <zauddelig@gmail.com> | 2015-06-02 11:08:41 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-02 12:39:34 -0400 |
| commit | 262d4db8c4c849b0fdd84550fb96472446cf90df (patch) | |
| tree | 0dc9e17d81956757b16bffcc4fd8cf5002792fb7 /django/utils/dateparse.py | |
| parent | 3222fc79431c0866aa65b2a83fbbffd2c3034d08 (diff) | |
Fixed #24897 -- Allowed using choices longer than 1 day with DurationField
Diffstat (limited to 'django/utils/dateparse.py')
| -rw-r--r-- | django/utils/dateparse.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py index a3c760e8fb..30a96f818e 100644 --- a/django/utils/dateparse.py +++ b/django/utils/dateparse.py @@ -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+)' |