gh-104783: locale.getencoding() fallback uses FS encoding (#105381)

The locale.getencoding() function now uses
sys.getfilesystemencoding() if _locale.getencoding() is missing,
instead of calling locale.getdefaultlocale().
This commit is contained in:
Victor Stinner 2023-06-06 16:55:21 +02:00 committed by GitHub
parent 3a975b5e92
commit b1a91d26c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions

View File

@ -616,16 +616,12 @@ def setlocale(category, locale=None):
try:
from _locale import getencoding
except ImportError:
# When _locale.getencoding() is missing, locale.getencoding() uses the
# Python filesystem encoding.
_encoding = sys.getfilesystemencoding()
def getencoding():
if hasattr(sys, 'getandroidapilevel'):
# On Android langinfo.h and CODESET are missing, and UTF-8 is
# always used in mbstowcs() and wcstombs().
return 'utf-8'
encoding = _getdefaultlocale()[1]
if encoding is None:
# LANG not set, default to UTF-8
encoding = 'utf-8'
return encoding
return _encoding
try:
CODESET

View File

@ -1,6 +1,8 @@
from decimal import Decimal
from test.support import verbose, is_android, is_emscripten, is_wasi
from test.support.warnings_helper import check_warnings
from test.support.import_helper import import_fresh_module
from unittest import mock
import unittest
import locale
import sys
@ -523,6 +525,15 @@ class TestMiscellaneous(unittest.TestCase):
# make sure it is valid
codecs.lookup(enc)
def test_getencoding_fallback(self):
# When _locale.getencoding() is missing, locale.getencoding() uses
# the Python filesystem
encoding = 'FALLBACK_ENCODING'
with mock.patch.object(sys, 'getfilesystemencoding',
return_value=encoding):
locale_fallback = import_fresh_module('locale', blocked=['_locale'])
self.assertEqual(locale_fallback.getencoding(), encoding)
def test_getpreferredencoding(self):
# Invoke getpreferredencoding to make sure it does not cause exceptions.
enc = locale.getpreferredencoding()