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
36 changes: 27 additions & 9 deletions dateparser/date.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,31 +331,49 @@ def parse_with_formats(
"""
period = "day"
for date_format in date_formats:
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
)
Expand Down
16 changes: 11 additions & 5 deletions dateparser/utils/strptime.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
64 changes: 64 additions & 0 deletions tests/test_date_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_freshness_date_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,7 @@ def test_freshness_date_with_to_timezone_setting(self) -> None:
)

parser = dateparser.freshness_date_parser.FreshnessDateDataParser()
timezone = ZoneInfo(key="US/Eastern")
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"]
Expand Down