Skip to content
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.

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

gh-104783: Remove locale.resetlocale() function #104784

Merged
merged 2 commits into from
Jun 6, 2023
Merged
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
10 changes: 0 additions & 10 deletions Doc/library/locale.rst
Original file line number Diff line number Diff line change
Expand Up @@ -370,16 +370,6 @@ The :mod:`locale` module defines the following exception and functions:
encoding for the locale code just like :func:`setlocale`.


.. function:: resetlocale(category=LC_ALL)

Sets the locale for *category* to the default setting.

The default setting is determined by calling :func:`getdefaultlocale`.
*category* defaults to :const:`LC_ALL`.

.. deprecated-removed:: 3.11 3.13


.. function:: strcoll(string1, string2)

Compares two strings according to the current :const:`LC_COLLATE` setting. As
Expand Down
1 change: 1 addition & 0 deletions Doc/whatsnew/3.12.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,7 @@ APIs:

* :class:`!configparser.LegacyInterpolation` (:gh:`90765`)
* :func:`locale.getdefaultlocale` (:gh:`90817`)
* ``locale.resetlocale()`` (:gh:`90817`)
* :meth:`!turtle.RawTurtle.settiltangle` (:gh:`50096`)
* :func:`!unittest.findTestCases` (:gh:`50096`)
* :func:`!unittest.getTestCaseNames` (:gh:`50096`)
Expand Down
4 changes: 4 additions & 0 deletions Doc/whatsnew/3.13.rst
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ Removed
added in Python 3.8 and the old macros were deprecated in Python 3.11.
(Contributed by Irit Katriel in :gh:`105111`.)

* Remove ``locale.resetlocale()`` function deprecated in Python 3.11:
use ``locale.setlocale(locale.LC_ALL, "")`` instead.
(Contributed by Victor Stinner in :gh:`104783`.)


Porting to Python 3.13
======================
Expand Down
33 changes: 1 addition & 32 deletions Lib/locale.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# Yuck: LC_MESSAGES is non-standard: can't tell whether it exists before
# trying the import. So __all__ is also fiddled at the end of the file.
__all__ = ["getlocale", "getdefaultlocale", "getpreferredencoding", "Error",
"setlocale", "resetlocale", "localeconv", "strcoll", "strxfrm",
"setlocale", "localeconv", "strcoll", "strxfrm",
"str", "atof", "atoi", "format_string", "currency",
"normalize", "LC_CTYPE", "LC_COLLATE", "LC_TIME", "LC_MONETARY",
"LC_NUMERIC", "LC_ALL", "CHAR_MAX", "getencoding"]
Expand Down Expand Up @@ -612,26 +612,6 @@ def setlocale(category, locale=None):
locale = normalize(_build_localename(locale))
return _setlocale(category, locale)

def resetlocale(category=LC_ALL):

""" Sets the locale for category to the default setting.

The default setting is determined by calling
getdefaultlocale(). category defaults to LC_ALL.

"""
import warnings
warnings.warn(
'Use locale.setlocale(locale.LC_ALL, "") instead',
DeprecationWarning, stacklevel=2
)

with warnings.catch_warnings():
warnings.simplefilter('ignore', category=DeprecationWarning)
loc = getdefaultlocale()

_setlocale(category, _build_localename(loc))


try:
from _locale import getencoding
Expand Down Expand Up @@ -1729,17 +1709,6 @@ def _init_categories(categories=categories):
print(' Encoding: ', enc or '(undefined)')
print()

print()
print('Locale settings after calling resetlocale():')
print('-'*72)
resetlocale()
for name,category in categories.items():
print(name, '...')
lang, enc = getlocale(category)
print(' Language: ', lang or '(undefined)')
print(' Encoding: ', enc or '(undefined)')
print()

try:
setlocale(LC_ALL, "")
except:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Remove ``locale.resetlocale()`` function deprecated in Python 3.11.
Patch by Victor Stinner.