Skip to content

Preserve four-digit years when parsing week and ordinal dates #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charan-rathore wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve four-digit years when parsing week and ordinal dates #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions arrow/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ def _build_datetime(parts: _Parts) -> datetime:
# day not given, default to 1
_day = 1

date_string = f"{year}-{week}-{_day}"
date_string = f"{year:04d}-{week}-{_day}"

# tokens for ISO 8601 weekdates
dt = datetime.strptime(date_string, "%G-%V-%u")
Expand Down Expand Up @@ -750,7 +750,7 @@ def _build_datetime(parts: _Parts) -> datetime:
"Month component is not allowed with the DDD and DDDD tokens."
)

date_string = f"{_year}-{day_of_year}"
date_string = f"{_year:04d}-{day_of_year}"
try:
dt = datetime.strptime(date_string, "%Y-%j")
except ValueError:
Expand Down
14 changes: 14 additions & 0 deletions tests/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,20 @@ def test_parse_HH_24(self):
with pytest.raises(ParserError):
self.parser.parse("2019-12-31T24:00:00.999999", "YYYY-MM-DDTHH:mm:ss.S")

@pytest.mark.parametrize("year", [1, 4, 12, 99, 400, 999, 1000, 2024])
@pytest.mark.parametrize("token", ["DDD", "DDDD"])
def test_parse_low_year_ordinal(self, year, token):
ordinal = "2" if token == "DDD" else "002"
value = f"{year:04d}-{ordinal}"
assert self.parser.parse(value, f"YYYY-{token}") == datetime(year, 1, 2)

@pytest.mark.parametrize("year", [1, 4, 12, 99, 400, 999, 1000, 2024])
def test_parse_low_year_iso_week(self, year):
value = f"{year:04d}-W01-1"
expected = datetime.fromisocalendar(year, 1, 1)
assert self.parser.parse(value, "W") == expected
assert arrow.get(value) == arrow.Arrow.fromdatetime(expected)

def test_parse_W(self):
assert self.parser.parse("2011-W05-4", "W") == datetime(2011, 2, 3)
assert self.parser.parse("2011W054", "W") == datetime(2011, 2, 3)
Expand Down
Loading