From 91c931afe30bc0aaa787b778b9d85fb68427ae0b Mon Sep 17 00:00:00 2001 From: agammann <161159040+agammann@users.noreply.github.com> Date: Tue, 20 Oct 2026 20:24:02 -0700 Subject: [PATCH 1/4] Align yearless custom formats with reference date --- dateparser/date.py | 38 +++++++++++++++------ dateparser/utils/strptime.py | 16 ++++++--- tests/test_date_parser.py | 64 ++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 15 deletions(-) diff --git a/dateparser/date.py b/dateparser/date.py index fd26c1691..63f118842 100644 --- a/dateparser/date.py +++ b/dateparser/date.py @@ -331,31 +331,49 @@ def parse_with_formats( """ period = "day" for date_format in date_formats: + _missing = _get_missing_parts(date_format) + now = settings.RELATIVE_BASE or _now(settings) try: - date_obj = patched_strptime(date_string, date_format) + date_obj = patched_strptime( + date_string, date_format, reference_year=now.year + ) except ValueError: continue else: - _missing = _get_missing_parts(date_format) + if "year" in _missing: + try: + date_obj = date_obj.replace(year=now.year) + except ValueError: + continue + missing_month = "month" in _missing missing_day = "day" in _missing if missing_month and missing_day: period = "year" - date_obj = set_correct_month_from_settings(date_obj, settings) - date_obj = set_correct_day_from_settings(date_obj, settings) + date_obj = set_correct_month_from_settings( + date_obj, settings, current_month=now.month + ) + date_obj = set_correct_day_from_settings( + date_obj, settings, current_day=now.day + ) elif missing_month: period = "year" - date_obj = set_correct_month_from_settings(date_obj, settings) + date_obj = set_correct_month_from_settings( + date_obj, settings, current_month=now.month + ) elif missing_day: period = "month" - date_obj = set_correct_day_from_settings(date_obj, settings) + date_obj = set_correct_day_from_settings( + date_obj, settings, current_day=now.day + ) - now = settings.RELATIVE_BASE or _now(settings) - if "year" in _missing: - date_obj = date_obj.replace(year=now.year) - elif "%y" in date_format and "%Y" not in date_format: + if ( + "year" not in _missing + and "%y" in date_format + and "%Y" not in date_format + ): date_obj = _apply_century_preference( date_obj, now, settings.PREFER_DATES_FROM ) diff --git a/dateparser/utils/strptime.py b/dateparser/utils/strptime.py index 041fe807f..612947ca9 100644 --- a/dateparser/utils/strptime.py +++ b/dateparser/utils/strptime.py @@ -122,21 +122,27 @@ def repl(m: re.Match[str]) -> str: return day_of_month_in_format and not year_in_format, day_of_year_in_format -def _prepare_format(date_string: str, og_format: str) -> tuple[str, str, bool]: +def _prepare_format( + date_string: str, og_format: str, reference_year: int | None = None +) -> tuple[str, str, bool]: missing_year, day_of_year_in_format = _inspect_format(og_format) if missing_year: - current_year = datetime.today().year + year = reference_year if reference_year is not None else datetime.today().year return ( - f"{current_year} {date_string}", + f"{year} {date_string}", f"%Y {og_format}", day_of_year_in_format, ) return date_string, og_format, day_of_year_in_format -def strptime(date_string: str, format: str) -> datetime: # noqa: A002 +def strptime( + date_string: str, + format: str, # noqa: A002 + reference_year: int | None = None, +) -> datetime: date_string, prepared_format, day_of_year_in_format = _prepare_format( - date_string, format + date_string, format, reference_year ) time_tuple = __strptime(date_string, prepared_format) obj = datetime(*time_tuple[:-3]) diff --git a/tests/test_date_parser.py b/tests/test_date_parser.py index 60b96516a..b3d4562d2 100644 --- a/tests/test_date_parser.py +++ b/tests/test_date_parser.py @@ -19,6 +19,70 @@ class TestDateParser(BaseTestCase): + @parameterized.expand( + [ + (2024, "first", 1), + (2024, "current", 15), + (2024, "last", 29), + (2023, "last", 28), + ] + ) + def test_yearless_format_uses_reference_day_preference( + self, year: int, preference: str, day: int + ) -> None: + result = parse( + "February", + date_formats=["%B"], + settings={ + "RELATIVE_BASE": datetime(year, 6, 15), + "PREFER_DAY_OF_MONTH": preference, + "PARSERS": ["custom-formats"], + }, + ) + self.assertEqual(result, datetime(year, 2, day)) + + @parameterized.expand([("first", 1), ("current", 7), ("last", 12)]) + def test_year_only_format_uses_reference_month_and_day( + self, preference: str, month: int + ) -> None: + result = parse( + "2030", + date_formats=["%Y"], + settings={ + "RELATIVE_BASE": datetime(2024, 7, 17), + "PREFER_MONTH_OF_YEAR": preference, + "PREFER_DAY_OF_MONTH": "current", + "PARSERS": ["custom-formats"], + }, + ) + self.assertEqual(result, datetime(2030, month, 17)) + + @parameterized.expand([(2024, datetime(2024, 2, 29)), (2023, None)]) + def test_yearless_leap_day_respects_reference_year( + self, year: int, expected: datetime | None + ) -> None: + result = parse( + "29 February", + date_formats=["%d %B"], + settings={ + "RELATIVE_BASE": datetime(year, 6, 15), + "PARSERS": ["custom-formats"], + }, + ) + self.assertEqual(result, expected) + + def test_yearless_format_without_relative_base_uses_current_date(self) -> None: + with patch("dateparser.date._now", return_value=datetime(2024, 7, 17)): + result = parse( + "February", + date_formats=["%B"], + settings={ + "PREFER_DAY_OF_MONTH": "current", + "PARSERS": ["custom-formats"], + }, + ) + self.assertEqual(result, datetime(2024, 2, 17)) + def setUp(self) -> None: super().setUp() self.parser: DateDataParser = NotImplemented From 2bff7e76877f85098d6d0dc2858eca5c9b073c94 Mon Sep 17 00:00:00 2001 From: Ammann Labs <161159040+agammann@users.noreply.github.com> Date: Tue, 27 Oct 2026 17:04:59 -0700 Subject: [PATCH 2/4] Use canonical timezone in freshness parser test Avoid requiring the optional US/Eastern backward-compatibility alias in system tzdata. America/New_York preserves the intended Eastern daylight time conversion without adding a dependency or changing parser behavior. --- tests/test_freshness_date_parser.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_freshness_date_parser.py b/tests/test_freshness_date_parser.py index c8cd8b1dc..dc5e05760 100644 --- a/tests/test_freshness_date_parser.py +++ b/tests/test_freshness_date_parser.py @@ -2603,7 +2603,8 @@ def test_freshness_date_with_to_timezone_setting(self) -> None: ) parser = dateparser.freshness_date_parser.FreshnessDateDataParser() - timezone = ZoneInfo(key="US/Eastern") + # Use the canonical name: system tzdata may omit backward-compatibility links. + timezone = ZoneInfo(key="America/New_York") parser.get_local_tz = Mock(return_value=timezone) # type: ignore[method-assign] result = parser.get_date_data("1 minute ago", _settings) result = result["date_obj"] From 51270be917d9134f3564dcbfca9b6de8ce23a933 Mon Sep 17 00:00:00 2001 From: Ammann Labs <161159040+agammann@users.noreply.github.com> Date: Tue, 27 Oct 2026 17:06:52 -0700 Subject: [PATCH 3/4] Align timezone fixture with upstream fix Upstream #1550 independently selected the same canonical timezone. Drop the explanatory comment to avoid a needless overlapping-hunk conflict with that change; test behavior is unchanged. --- tests/test_freshness_date_parser.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_freshness_date_parser.py b/tests/test_freshness_date_parser.py index dc5e05760..938796c5e 100644 --- a/tests/test_freshness_date_parser.py +++ b/tests/test_freshness_date_parser.py @@ -2603,7 +2603,6 @@ def test_freshness_date_with_to_timezone_setting(self) -> None: ) parser = dateparser.freshness_date_parser.FreshnessDateDataParser() - # Use the canonical name: system tzdata may omit backward-compatibility links. timezone = ZoneInfo(key="America/New_York") parser.get_local_tz = Mock(return_value=timezone) # type: ignore[method-assign] result = parser.get_date_data("1 minute ago", _settings) From 5679d093a41d084e0b1586c0f37cb96fd9f1814e Mon Sep 17 00:00:00 2001 From: Ammann Labs <161159040+agammann@users.noreply.github.com> Date: Fri, 13 Nov 2026 22:44:02 -0800 Subject: [PATCH 4/4] Skip missing-part analysis for unsuccessful formats --- dateparser/date.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dateparser/date.py b/dateparser/date.py index 63f118842..943aca69b 100644 --- a/dateparser/date.py +++ b/dateparser/date.py @@ -331,7 +331,6 @@ def parse_with_formats( """ period = "day" for date_format in date_formats: - _missing = _get_missing_parts(date_format) now = settings.RELATIVE_BASE or _now(settings) try: date_obj = patched_strptime( @@ -340,6 +339,7 @@ def parse_with_formats( except ValueError: continue else: + _missing = _get_missing_parts(date_format) if "year" in _missing: try: date_obj = date_obj.replace(year=now.year)