diff options
| author | Mathieu Le Marec - Pasquet <kiorky@cryptelium.net> | 2024-12-02 22:04:05 +0100 |
|---|---|---|
| committer | Mathieu Le Marec - Pasquet <kiorky@cryptelium.net> | 2023-04-12 17:53:25 +0200 |
| commit | e99d8559052e0675cbedaa884b81700cf1c25ec5 (patch) | |
| tree | 26d4be22199abe4120eeb768442fe6e60df519d7 | |
| parent | 82e474399d5ab03d0947d53ee5d966f9442d7220 (diff) | |
| download | croniter-e99d8559052e0675cbedaa884b81700cf1c25ec5.tar.gz | |
restore py2 compat
This fixes #38
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | src/croniter/croniter.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3ae6f63..789f7a9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,7 @@ Changelog 1.3.12 (unreleased) ------------------- -- Nothing changed yet. +- restore py2 compat 1.3.11 (2023-04-12) diff --git a/src/croniter/croniter.py b/src/croniter/croniter.py index 89246ea..dbd005f 100644 --- a/src/croniter/croniter.py +++ b/src/croniter/croniter.py @@ -36,8 +36,10 @@ only_int_re = re.compile(r'^\d+$') WEEKDAYS = '|'.join(DOW_ALPHAS.keys()) MONTHS = '|'.join(M_ALPHAS.keys()) star_or_int_re = re.compile(r'^(\d+|\*)$') -special_dow_re = re.compile(rf'^(?P<pre>((?P<he>(({WEEKDAYS})(-({WEEKDAYS}))?)' - rf'|(({MONTHS})(-({MONTHS}))?)|\w+)#)|l)(?P<last>\d+)$') +special_dow_re = re.compile( + (r'^(?P<pre>((?P<he>(({WEEKDAYS})(-({WEEKDAYS}))?)').format(WEEKDAYS=WEEKDAYS) + + (r'|(({MONTHS})(-({MONTHS}))?)|\w+)#)|l)(?P<last>\d+)$').format(MONTHS=MONTHS) +) hash_expression_re = re.compile( r'^(?P<hash_type>h|r)(\((?P<range_begin>\d+)-(?P<range_end>\d+)\))?(\/(?P<divisor>\d+))?$' ) |