Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions dateparser/date.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,13 @@ def get_date_from_timestamp(
return None


def _apply_century_preference(
date_obj: datetime, now: datetime, prefer_from: str
def _apply_year_preference(
date_obj: datetime, now: datetime, prefer_from: str, years: int
) -> datetime:
"""Shift *date_obj* by ±100 years to satisfy PREFER_DATES_FROM.
"""Shift *date_obj* by ±*years* to satisfy PREFER_DATES_FROM.

*date_obj* and *now* are compared as naive datetimes, so either of them
Used with ``years=100`` for a two-digit-year format and ``years=1`` for a
format with no year at all. *date_obj* and *now* are compared as naive datetimes, so either of them
can be tz-aware. When the shifted year falls on Feb 29 in a non-leap
year, the nearest valid leap year in the preferred direction is used —
matching the behaviour of the NLP path in :file:`parser.py`.
Expand All @@ -353,9 +354,9 @@ def _apply_century_preference(
date_naive = date_obj.replace(tzinfo=None)

if now_naive < date_naive and prefer_from == "past":
target_year = date_obj.year - 100
target_year = date_obj.year - years
elif now_naive >= date_naive and prefer_from == "future":
target_year = date_obj.year + 100
target_year = date_obj.year + years
else:
return date_obj

Expand Down Expand Up @@ -405,9 +406,12 @@ def parse_with_formats(
now = settings.RELATIVE_BASE or _now(settings)
if "year" in _missing:
date_obj = date_obj.replace(year=now.year)
date_obj = _apply_year_preference(
date_obj, now, settings.PREFER_DATES_FROM, 1
)
elif "%y" in date_format and "%Y" not in date_format:
date_obj = _apply_century_preference(
date_obj, now, settings.PREFER_DATES_FROM
date_obj = _apply_year_preference(
date_obj, now, settings.PREFER_DATES_FROM, 100
)

date_obj = apply_timezone_from_settings(date_obj, settings)
Expand Down
26 changes: 25 additions & 1 deletion tests/test_date_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -2400,7 +2400,7 @@ def test_prefer_dates_from_with_date_formats_tz_aware_relative_base(self) -> Non
def test_prefer_dates_from_with_date_formats_feb29_non_leap(self) -> None:
"""Test that Feb 29 shifted to a non-leap year finds the next valid leap year (Bug #2 fix)."""
# 2/29/00 parses as 2000-02-29; shifting +100 → 2100 which is not a leap year.
# _apply_century_preference finds the next valid leap year: 2104.
# _apply_year_preference finds the next valid leap year: 2104.
result = parse(
"2/29/00",
date_formats=["%m/%d/%y"],
Expand All @@ -2415,6 +2415,30 @@ def test_prefer_dates_from_with_date_formats_feb29_non_leap(self) -> None:
self.assertEqual(2, result.month)
self.assertEqual(29, result.day)

@parameterized.expand(
[
param("December 25", "past", datetime(2026, 6, 15), datetime(2025, 12, 25)),
param("March 10", "future", datetime(2026, 6, 15), datetime(2027, 3, 10)),
]
)
def test_prefer_dates_from_with_yearless_format(
self,
date_string: str,
prefer_from: str,
relative_base: datetime,
expected: datetime,
) -> None:
"""PREFER_DATES_FROM also applies to a date_formats entry with no year."""
result = parse(
date_string,
date_formats=["%B %d"],
settings={
"PREFER_DATES_FROM": prefer_from,
"RELATIVE_BASE": relative_base,
},
)
self.assertEqual(expected, result)

@parameterized.expand(
[
param(date_string="1999001", expected=datetime(1999, 1, 1)),
Expand Down