Skip to content

Fix week formatting at the maximum supported year #1403

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

Closed
KennyMcSimpson wants to merge 1 commit into from
Closed

Fix week formatting at the maximum supported year #1403

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
3 changes: 2 additions & 1 deletion babel/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,8 @@ def get_week_of_year(self) -> int:
date = datetime.date(self.value.year - 1, 12, 31)
week = self.get_week_number(self.get_day_of_year(date), date.weekday())
elif week > 52:
weekday = datetime.date(self.value.year + 1, 1, 1).weekday()
# Derive the next January 1 without exceeding datetime's year range.
weekday = (datetime.date(self.value.year, 12, 31).weekday() + 1) % 7
if (
self.get_week_number(1, weekday) == 1
and 32 - (weekday - self.locale.first_week_day) % 7 <= self.value.day
Expand Down
32 changes: 32 additions & 0 deletions tests/test_dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,38 @@ def test_datetime_format_get_week_number():
assert format.get_week_number(6) == 2


@pytest.mark.parametrize(('value', 'formatter'), [
(date.max, dates.format_date),
(datetime.max, dates.format_datetime),
])
@pytest.mark.parametrize(('locale', 'expected'), [
('en_AU', '10000-W01-5'), # Monday, minimum one day.
('aa_DJ', '9999-W53-7'), # Saturday, minimum one day.
('en_US', '10000-W01-6'), # Sunday, minimum one day.
('en_GB', '9999-W52-5'), # Monday, minimum four days.
('dv_MV', '10000-W01-1'), # Friday, minimum one day.
('pt_PT', '9999-W52-6'), # Sunday, minimum four days.
])
def test_week_numbering_at_max_year(value, formatter, locale, expected):
assert formatter(value, "YYYY-'W'ww-e", locale=locale) == expected


@pytest.mark.parametrize(('value', 'formatter'), [
(date.min, dates.format_date),
(datetime.min, dates.format_datetime),
])
@pytest.mark.parametrize(('locale', 'expected'), [
('en_AU', '0001-W01-1'),
('aa_DJ', '0001-W01-3'),
('en_US', '0001-W01-2'),
('en_GB', '0001-W01-1'),
('dv_MV', '0001-W01-4'),
('pt_PT', '0001-W01-2'),
])
def test_week_numbering_at_min_year(value, formatter, locale, expected):
assert formatter(value, "YYYY-'W'ww-e", locale=locale) == expected


def test_parse_pattern():
assert dates.parse_pattern("MMMMd").format == '%(MMMM)s%(d)s'
assert (dates.parse_pattern("MMM d, yyyy").format ==
Expand Down