mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-46659: calendar uses locale.getlocale() (GH-31166)

Browse source 
The calendar.LocaleTextCalendar and calendar.LocaleHTMLCalendar
classes module now use locale.getlocale(), instead of using
locale.getdefaultlocale(), if no locale is specified.
This commit is contained in:
Victor Stinner 2022-02-08 00:24:09 +01:00 • committed by GitHub
parent 7ba1cc8049
commit 7a0486eaa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/calendar.rst
View file

@ -290,7 +290,7 @@ interpreted as prescribed by the ISO 8601 standard. Year 0 is 1 BC, year -1 is
.. note:: .. note::
The :meth:`formatweekday` and :meth:`formatmonthname` methods of these two The :meth:`formatweekday` and :meth:`formatmonthname` methods of these two
classes temporarily change the current locale to the given *locale*. Because classes temporarily change the ``LC_TIME`` locale to the given *locale*. Because
the current locale is a process-wide setting, they are not thread-safe. the current locale is a process-wide setting, they are not thread-safe.

6
Doc/whatsnew/3.11.rst
View file

@ -591,6 +591,12 @@ Changes in the Python API
of sorting simply isn't well-defined in the absence of a total ordering of sorting simply isn't well-defined in the absence of a total ordering
on list elements. on list elements.
* :mod:`calendar`: The :class:`calendar.LocaleTextCalendar` and
:class:`calendar.LocaleHTMLCalendar` classes now use
:func:`locale.getlocale`, instead of using :func:`locale.getdefaultlocale`,
if no locale is specified.
(Contributed by Victor Stinner in :issue:`46659`.)
Build Changes Build Changes
============= =============

4
Lib/calendar.py
View file

@ -566,7 +566,7 @@ class LocaleTextCalendar(TextCalendar):
def __init__(self, firstweekday=0, locale=None): def __init__(self, firstweekday=0, locale=None):
TextCalendar.__init__(self, firstweekday) TextCalendar.__init__(self, firstweekday)
if locale is None: if locale is None:
locale = _locale.getdefaultlocale() locale = _locale.getlocale(_locale.LC_TIME)
self.locale = locale self.locale = locale
def formatweekday(self, day, width): def formatweekday(self, day, width):
@ -586,7 +586,7 @@ class LocaleHTMLCalendar(HTMLCalendar):
def __init__(self, firstweekday=0, locale=None): def __init__(self, firstweekday=0, locale=None):
HTMLCalendar.__init__(self, firstweekday) HTMLCalendar.__init__(self, firstweekday)
if locale is None: if locale is None:
locale = _locale.getdefaultlocale() locale = _locale.getlocale(_locale.LC_TIME)
self.locale = locale self.locale = locale
def formatweekday(self, day): def formatweekday(self, day):

3
Lib/test/test_calendar.py
View file

@ -859,7 +859,8 @@ class CommandLineTestCase(unittest.TestCase):
self.assertFailure('-L') self.assertFailure('-L')
self.assertFailure('--locale') self.assertFailure('--locale')
self.assertFailure('-L', 'en') self.assertFailure('-L', 'en')
lang, enc = locale.getdefaultlocale()
lang, enc = locale.getlocale()
lang = lang or 'C' lang = lang or 'C'
enc = enc or 'UTF-8' enc = enc or 'UTF-8'
try: try:

4
Misc/NEWS.d/next/Library/2022-02-06-19-13-02.bpo-46659.q-vNL9.rst Normal file
View file

@ -0,0 +1,4 @@
The :class:`calendar.LocaleTextCalendar` and
:class:`calendar.LocaleHTMLCalendar` classes now use :func:`locale.getlocale`,
instead of using :func:`locale.getdefaultlocale`, if no locale is specified.
Patch by Victor Stinner.