diff options
| author | Scott Gasch <[email protected]> | 2022-06-08 17:23:33 -0700 |
|---|---|---|
| committer | Scott Gasch <[email protected]> | 2022-06-08 17:23:33 -0700 |
| commit | 82e1225c6f8a6ee59f373c07a7873b373acb19dc (patch) | |
| tree | f4e92e96094916ba241cf511a6f19d190716fdc8 /dateparse | |
| parent | d787af63a44ba2caa4937e1da9e87255d67b210a (diff) | |
Improve dateparse and make string_utils.extract_date.
Diffstat (limited to 'dateparse')
| -rw-r--r-- | dateparse/dateparse_utils.g4 | 1 | ||||
| -rwxr-xr-x | dateparse/dateparse_utils.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dateparse/dateparse_utils.g4 b/dateparse/dateparse_utils.g4 index 4701299..364aa0f 100644 --- a/dateparse/dateparse_utils.g4 +++ b/dateparse/dateparse_utils.g4 @@ -57,6 +57,7 @@ singleDateExpr | nthWeekdayInMonthMaybeYearExpr | firstLastWeekdayInMonthMaybeYearExpr | deltaDateExprRelativeToTodayImplied + | dayName (SPACE|ddiv)+ monthDayMaybeYearExpr (SPACE|ddiv)* singleTimeExpr* | dayName ; diff --git a/dateparse/dateparse_utils.py b/dateparse/dateparse_utils.py index ee2bbd9..2e6eabd 100755 --- a/dateparse/dateparse_utils.py +++ b/dateparse/dateparse_utils.py @@ -348,7 +348,7 @@ class DateParser(dateparse_utilsListener): return 5 def _parse_normal_date(self) -> datetime.date: - if 'dow' in self.context: + if 'dow' in self.context and 'month' not in self.context: d = self.today while d.weekday() != self.context['dow']: d += datetime.timedelta(days=1) |