mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
bpo-36443: Disable C locale coercion and UTF-8 Mode by default (GH-12589)
bpo-36443, bpo-36202: Since Python 3.7.0, calling Py_DecodeLocale() before Py_Initialize() produces mojibake if the LC_CTYPE locale is coerced and/or if the UTF-8 Mode is enabled by the user configuration. This change fix the issue by disabling LC_CTYPE coercion and UTF-8 Mode by default. They must now be enabled explicitly (opt-in) using the new _Py_PreInitialize() API with _PyPreConfig. When embedding Python, set coerce_c_locale and utf8_mode attributes of _PyPreConfig to -1 to enable automatically these parameters depending on the LC_CTYPE locale, environment variables and command line arguments Alternative: Setting Py_UTF8Mode to 1 always explicitly enables the UTF-8 Mode. Changes: * _PyPreConfig_INIT now sets coerce_c_locale and utf8_mode to 0 by default. * _Py_InitializeFromArgs() and _Py_InitializeFromWideArgs() can now be called with config=NULL.
This commit is contained in:
parent
4a9a505d6f
commit
d929f1838a
7 changed files with 58 additions and 46 deletions
|
@ -494,8 +494,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
|
|||
if key not in expected_preconfig:
|
||||
expected_preconfig[key] = expected_config[key]
|
||||
|
||||
self.check_core_config(config, expected_config)
|
||||
self.check_pre_config(config, expected_preconfig)
|
||||
self.check_core_config(config, expected_config)
|
||||
self.check_global_config(config)
|
||||
|
||||
def test_init_default_config(self):
|
||||
|
@ -573,7 +573,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
|
|||
|
||||
INIT_ENV_PRECONFIG = {
|
||||
'allocator': 'malloc',
|
||||
'utf8_mode': 1,
|
||||
}
|
||||
INIT_ENV_CONFIG = {
|
||||
'use_hash_seed': 1,
|
||||
|
@ -581,8 +580,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
|
|||
'tracemalloc': 2,
|
||||
'import_time': 1,
|
||||
'malloc_stats': 1,
|
||||
'filesystem_encoding': 'utf-8',
|
||||
'filesystem_errors': UTF8_MODE_ERRORS,
|
||||
'inspect': 1,
|
||||
'optimization_level': 2,
|
||||
'pycache_prefix': 'env_pycache_prefix',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue