Skip to content

gh-130665: Only apply locale to calendar CLI via --locale and not LANG env var #130676

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

Merged
merged 2 commits into from
Feb 28, 2025
Merged

gh-130665: Only apply locale to calendar CLI via --locale and not LANG env var #130676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659597e
Fix calendar CLI when locale set via env var but not --locale
hugovk Feb 28, 2025
c7e02c0
Add blurb
hugovk Feb 28, 2025
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
10 changes: 8 additions & 2 deletions Lib/calendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ def formatmonthname(self, theyear, themonth, withyear=True):
return super().formatmonthname(theyear, themonth, withyear)


class _CLIDemoCalendar(LocaleTextCalendar):
class _CLIDemoCalendar(TextCalendar):
def __init__(self, highlight_day=None, *args, **kwargs):
super().__init__(*args, **kwargs)
self.highlight_day = highlight_day
Expand Down Expand Up @@ -752,6 +752,12 @@ def formatyear(self, theyear, w=2, l=1, c=6, m=3):
return ''.join(v)


class _CLIDemoLocaleCalendar(LocaleTextCalendar, _CLIDemoCalendar):
def __init__(self, highlight_day=None, *args, **kwargs):
super().__init__(*args, **kwargs)
self.highlight_day = highlight_day


# Support for old module level interface
c = TextCalendar()

Expand Down Expand Up @@ -893,7 +899,7 @@ def main(args=None):
write(cal.formatyearpage(options.year, **optdict))
else:
if options.locale:
cal = _CLIDemoCalendar(highlight_day=today, locale=locale)
cal = _CLIDemoLocaleCalendar(highlight_day=today, locale=locale)
else:
cal = _CLIDemoCalendar(highlight_day=today)
cal.setfirstweekday(options.first_weekday)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2025-02-28-11-56-19.gh-issue-130665.cfksVk.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Only apply locale to :ref:`calendar CLI <calendar-cli>` when set via
``--locale`` and not via ``LANG`` environment variable.
Loading