diff options
| author | Jeong, YunWon <69878+youknowone@users.noreply.github.com> | 2023-03-30 16:23:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-30 16:23:43 (GMT) |
| commit | 21e9de3bf0ecf32cd61296009518bfb9fdfcd04f (patch) | |
| tree | 11744c95e2c2072e04badf1c541b745a27470f13 | |
| parent | fda95aa19447fe444ac2670afbf98ec42aca0c6f (diff) | |
| download | cpython-21e9de3bf0ecf32cd61296009518bfb9fdfcd04f.zip cpython-21e9de3bf0ecf32cd61296009518bfb9fdfcd04f.tar.gz cpython-21e9de3bf0ecf32cd61296009518bfb9fdfcd04f.tar.bz2 | |
gh-103085: Fix python locale.getencoding not to emit deprecation warning (gh-103086)
| -rw-r--r-- | Lib/locale.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2023-03-28-15-12-53.gh-issue-103085.DqNehf.rst | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/locale.py b/Lib/locale.py index c2c7a04..4127d91 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -545,7 +545,9 @@ def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')): "Use setlocale(), getencoding() and getlocale() instead", DeprecationWarning, stacklevel=2 ) + return _getdefaultlocale(envvars) +def _getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')): try: # check if it's supported by the _locale module import _locale @@ -639,7 +641,7 @@ except ImportError: # On Android langinfo.h and CODESET are missing, and UTF-8 is # always used in mbstowcs() and wcstombs(). return 'utf-8' - encoding = getdefaultlocale()[1] + encoding = _getdefaultlocale()[1] if encoding is None: # LANG not set, default to UTF-8 encoding = 'utf-8' diff --git a/Misc/NEWS.d/next/Library/2023-03-28-15-12-53.gh-issue-103085.DqNehf.rst b/Misc/NEWS.d/next/Library/2023-03-28-15-12-53.gh-issue-103085.DqNehf.rst new file mode 100644 index 0000000..fa07fa5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-03-28-15-12-53.gh-issue-103085.DqNehf.rst @@ -0,0 +1 @@ +Pure python :func:`locale.getencoding()` will not warn deprecation. |