diff options
| author | mendespedro <windowsxpedro@gmail.com> | 2021-12-15 13:56:04 -0300 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-12-20 06:46:34 +0100 |
| commit | 4fd3044ca0135da903a70dfb66992293f529ecf1 (patch) | |
| tree | 5884d724f07c6d3c39d9477cec8093796a239f1c /django/utils/dateparse.py | |
| parent | b0d16d0129b7cc5978a8d55d2331a34cb369e6c7 (diff) | |
| download | django-4fd3044ca0135da903a70dfb66992293f529ecf1.tar.gz | |
Fixed #33368 -- Fixed parse_duration() crash on invalid separators for decimal fractions.
Diffstat (limited to 'django/utils/dateparse.py')
| -rw-r--r-- | django/utils/dateparse.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py index 238c727cb1..e2a806c8e8 100644 --- a/django/utils/dateparse.py +++ b/django/utils/dateparse.py @@ -42,11 +42,11 @@ standard_duration_re = _lazy_re_compile( iso8601_duration_re = _lazy_re_compile( r'^(?P<sign>[-+]?)' r'P' - r'(?:(?P<days>\d+(.\d+)?)D)?' + r'(?:(?P<days>\d+([\.,]\d+)?)D)?' r'(?:T' - r'(?:(?P<hours>\d+(.\d+)?)H)?' - r'(?:(?P<minutes>\d+(.\d+)?)M)?' - r'(?:(?P<seconds>\d+(.\d+)?)S)?' + r'(?:(?P<hours>\d+([\.,]\d+)?)H)?' + r'(?:(?P<minutes>\d+([\.,]\d+)?)M)?' + r'(?:(?P<seconds>\d+([\.,]\d+)?)S)?' r')?' r'$' ) |