mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-107954: Add PyConfig_MEMBER_BOOL type to PyConfigSpec (#116359)

Browse source 
_PyConfig_AsDict() now returns bool objects for options using the new
PyConfig_MEMBER_BOOL type.

Update tests for these changes.
This commit is contained in:
Victor Stinner 2024-03-06 10:29:27 +01:00 • committed by GitHub
parent 22ccf13b33
commit 2b379968e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 213 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

228
Lib/test/test_embed.py
View file

@ -443,31 +443,31 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
CONFIG_COMPAT = {
'_config_init': API_COMPAT,
'isolated': 0,
'use_environment': 1,
'dev_mode': 0,
'isolated': False,
'use_environment': True,
'dev_mode': False,
'install_signal_handlers': 1,
'use_hash_seed': 0,
'install_signal_handlers': True,
'use_hash_seed': False,
'hash_seed': 0,
'int_max_str_digits': sys.int_info.default_max_str_digits,
'cpu_count': -1,
'faulthandler': 0,
'faulthandler': False,
'tracemalloc': 0,
'perf_profiling': 0,
'import_time': 0,
'code_debug_ranges': 1,
'show_ref_count': 0,
'dump_refs': 0,
'perf_profiling': False,
'import_time': False,
'code_debug_ranges': True,
'show_ref_count': False,
'dump_refs': False,
'dump_refs_file': None,
'malloc_stats': 0,
'malloc_stats': False,
'filesystem_encoding': GET_DEFAULT_CONFIG,
'filesystem_errors': GET_DEFAULT_CONFIG,
'pycache_prefix': None,
'program_name': GET_DEFAULT_CONFIG,
'parse_argv': 0,
'parse_argv': False,
'argv': [""],
'orig_argv': [],
@ -484,39 +484,39 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'exec_prefix': GET_DEFAULT_CONFIG,
'base_exec_prefix': GET_DEFAULT_CONFIG,
'module_search_paths': GET_DEFAULT_CONFIG,
'module_search_paths_set': 1,
'module_search_paths_set': True,
'platlibdir': sys.platlibdir,
'stdlib_dir': GET_DEFAULT_CONFIG,
'site_import': 1,
'site_import': True,
'bytes_warning': 0,
'warn_default_encoding': 0,
'inspect': 0,
'interactive': 0,
'warn_default_encoding': False,
'inspect': False,
'interactive': False,
'optimization_level': 0,
'parser_debug': 0,
'write_bytecode': 1,
'parser_debug': False,
'write_bytecode': True,
'verbose': 0,
'quiet': 0,
'user_site_directory': 1,
'configure_c_stdio': 0,
'buffered_stdio': 1,
'quiet': False,
'user_site_directory': True,
'configure_c_stdio': False,
'buffered_stdio': True,
'stdio_encoding': GET_DEFAULT_CONFIG,
'stdio_errors': GET_DEFAULT_CONFIG,
'skip_source_first_line': 0,
'skip_source_first_line': False,
'run_command': None,
'run_module': None,
'run_filename': None,
'sys_path_0': None,
'_install_importlib': 1,
'_install_importlib': True,
'check_hash_pycs_mode': 'default',
'pathconfig_warnings': 1,
'_init_main': 1,
'pathconfig_warnings': True,
'_init_main': True,
'use_frozen_modules': not support.Py_DEBUG,
'safe_path': 0,
'safe_path': False,
'_is_python_build': IGNORE_CONFIG,
}
if Py_STATS:
@ -530,22 +530,22 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
CONFIG_PYTHON = dict(CONFIG_COMPAT,
_config_init=API_PYTHON,
configure_c_stdio=1,
parse_argv=2,
configure_c_stdio=True,
parse_argv=True,
)
CONFIG_ISOLATED = dict(CONFIG_COMPAT,
_config_init=API_ISOLATED,
isolated=1,
use_environment=0,
user_site_directory=0,
safe_path=1,
dev_mode=0,
install_signal_handlers=0,
use_hash_seed=0,
faulthandler=0,
isolated=True,
use_environment=False,
user_site_directory=False,
safe_path=True,
dev_mode=False,
install_signal_handlers=False,
use_hash_seed=False,
faulthandler=False,
tracemalloc=0,
perf_profiling=0,
pathconfig_warnings=0,
perf_profiling=False,
pathconfig_warnings=False,
)
if MS_WINDOWS:
CONFIG_ISOLATED['legacy_windows_stdio'] = 0
@ -851,15 +851,15 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'utf8_mode': 1,
}
config = {
'install_signal_handlers': 0,
'use_hash_seed': 1,
'install_signal_handlers': False,
'use_hash_seed': True,
'hash_seed': 123,
'tracemalloc': 2,
'perf_profiling': 0,
'import_time': 1,
'code_debug_ranges': 0,
'show_ref_count': 1,
'malloc_stats': 1,
'perf_profiling': False,
'import_time': True,
'code_debug_ranges': False,
'show_ref_count': True,
'malloc_stats': True,
'stdio_encoding': 'iso8859-1',
'stdio_errors': 'replace',
@ -872,7 +872,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'-X', 'cmdline_xoption',
'-c', 'pass',
'arg2'],
'parse_argv': 2,
'parse_argv': True,
'xoptions': [
'config_xoption1=3',
'config_xoption2=',
@ -886,26 +886,26 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
],
'run_command': 'pass\n',
'site_import': 0,
'site_import': False,
'bytes_warning': 1,
'inspect': 1,
'interactive': 1,
'inspect': True,
'interactive': True,
'optimization_level': 2,
'write_bytecode': 0,
'write_bytecode': False,
'verbose': 1,
'quiet': 1,
'configure_c_stdio': 1,
'buffered_stdio': 0,
'user_site_directory': 0,
'faulthandler': 1,
'quiet': True,
'configure_c_stdio': True,
'buffered_stdio': False,
'user_site_directory': False,
'faulthandler': True,
'platlibdir': 'my_platlibdir',
'module_search_paths': self.IGNORE_CONFIG,
'safe_path': 1,
'safe_path': True,
'int_max_str_digits': 31337,
'cpu_count': 4321,
'check_hash_pycs_mode': 'always',
'pathconfig_warnings': 0,
'pathconfig_warnings': False,
}
if Py_STATS:
config['_pystats'] = 1
@ -917,28 +917,28 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'allocator': ALLOCATOR_FOR_CONFIG,
}
config = {
'use_hash_seed': 1,
'use_hash_seed': True,
'hash_seed': 42,
'tracemalloc': 2,
'perf_profiling': 0,
'import_time': 1,
'code_debug_ranges': 0,
'malloc_stats': 1,
'inspect': 1,
'perf_profiling': False,
'import_time': True,
'code_debug_ranges': False,
'malloc_stats': True,
'inspect': True,
'optimization_level': 2,
'pythonpath_env': '/my/path',
'pycache_prefix': 'env_pycache_prefix',
'write_bytecode': 0,
'write_bytecode': False,
'verbose': 1,
'buffered_stdio': 0,
'buffered_stdio': False,
'stdio_encoding': 'iso8859-1',
'stdio_errors': 'replace',
'user_site_directory': 0,
'faulthandler': 1,
'user_site_directory': False,
'faulthandler': True,
'warnoptions': ['EnvVar'],
'platlibdir': 'env_platlibdir',
'module_search_paths': self.IGNORE_CONFIG,
'safe_path': 1,
'safe_path': True,
'int_max_str_digits': 4567,
}
if Py_STATS:
@ -952,32 +952,32 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'utf8_mode': 1,
}
config = {
'use_hash_seed': 1,
'use_hash_seed': True,
'hash_seed': 42,
'tracemalloc': 2,
'perf_profiling': 0,
'import_time': 1,
'code_debug_ranges': 0,
'malloc_stats': 1,
'inspect': 1,
'perf_profiling': False,
'import_time': True,
'code_debug_ranges': False,
'malloc_stats': True,
'inspect': True,
'optimization_level': 2,
'pythonpath_env': '/my/path',
'pycache_prefix': 'env_pycache_prefix',
'write_bytecode': 0,
'write_bytecode': False,
'verbose': 1,
'buffered_stdio': 0,
'buffered_stdio': False,
'stdio_encoding': 'iso8859-1',
'stdio_errors': 'replace',
'user_site_directory': 0,
'faulthandler': 1,
'user_site_directory': False,
'faulthandler': True,
'warnoptions': ['EnvVar'],
'platlibdir': 'env_platlibdir',
'module_search_paths': self.IGNORE_CONFIG,
'safe_path': 1,
'safe_path': True,
'int_max_str_digits': 4567,
}
if Py_STATS:
config['_pystats'] = 1
config['_pystats'] = True
self.check_all_configs("test_init_python_env", config, preconfig,
api=API_PYTHON)
@ -1002,8 +1002,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'allocator': PYMEM_ALLOCATOR_DEBUG,
}
config = {
'faulthandler': 1,
'dev_mode': 1,
'faulthandler': True,
'dev_mode': True,
'warnoptions': ['default'],
}
self.check_all_configs("test_init_dev_mode", config, preconfig,
@ -1019,11 +1019,11 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'argv': ['script.py'],
'orig_argv': ['python3', '-X', 'dev', '-P', 'script.py'],
'run_filename': os.path.abspath('script.py'),
'dev_mode': 1,
'faulthandler': 1,
'dev_mode': True,
'faulthandler': True,
'warnoptions': ['default'],
'xoptions': ['dev'],
'safe_path': 1,
'safe_path': True,
}
self.check_all_configs("test_preinit_parse_argv", config, preconfig,
api=API_PYTHON)
@ -1048,30 +1048,30 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
def test_init_isolated_flag(self):
config = {
'isolated': 1,
'safe_path': 1,
'use_environment': 0,
'user_site_directory': 0,
'isolated': True,
'safe_path': True,
'use_environment': False,
'user_site_directory': False,
}
self.check_all_configs("test_init_isolated_flag", config, api=API_PYTHON)
def test_preinit_isolated1(self):
# _PyPreConfig.isolated=1, _PyCoreConfig.isolated not set
config = {
'isolated': 1,
'safe_path': 1,
'use_environment': 0,
'user_site_directory': 0,
'isolated': True,
'safe_path': True,
'use_environment': False,
'user_site_directory': False,
}
self.check_all_configs("test_preinit_isolated1", config, api=API_COMPAT)
def test_preinit_isolated2(self):
# _PyPreConfig.isolated=0, _PyCoreConfig.isolated=1
config = {
'isolated': 1,
'safe_path': 1,
'use_environment': 0,
'user_site_directory': 0,
'isolated': True,
'safe_path': True,
'use_environment': False,
'user_site_directory': False,
}
self.check_all_configs("test_preinit_isolated2", config, api=API_COMPAT)
@ -1139,7 +1139,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'orig_argv': ['python3', '-c', code, 'arg2'],
'program_name': './python3',
'run_command': code + '\n',
'parse_argv': 2,
'parse_argv': True,
'sys_path_0': '',
}
self.check_all_configs("test_init_run_main", config, api=API_PYTHON)
@ -1154,7 +1154,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'arg2'],
'program_name': './python3',
'run_command': code + '\n',
'parse_argv': 2,
'parse_argv': True,
'_init_main': 0,
'sys_path_0': '',
}
@ -1164,12 +1164,12 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
def test_init_parse_argv(self):
config = {
'parse_argv': 2,
'parse_argv': True,
'argv': ['-c', 'arg1', '-v', 'arg3'],
'orig_argv': ['./argv0', '-E', '-c', 'pass', 'arg1', '-v', 'arg3'],
'program_name': './argv0',
'run_command': 'pass\n',
'use_environment': 0,
'use_environment': False,
}
self.check_all_configs("test_init_parse_argv", config, api=API_PYTHON)
@ -1178,7 +1178,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'parse_argv': 0,
}
config = {
'parse_argv': 0,
'parse_argv': False,
'argv': ['./argv0', '-E', '-c', 'pass', 'arg1', '-v', 'arg3'],
'orig_argv': ['./argv0', '-E', '-c', 'pass', 'arg1', '-v', 'arg3'],
'program_name': './argv0',
@ -1653,20 +1653,20 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
def test_init_use_frozen_modules(self):
tests = {
('=on', 1),
('=off', 0),
('=', 1),
('', 1),
('=on', True),
('=off', False),
('=', True),
('', True),
}
for raw, expected in tests:
optval = f'frozen_modules{raw}'
config = {
'parse_argv': 2,
'parse_argv': True,
'argv': ['-c'],
'orig_argv': ['./argv0', '-X', optval, '-c', 'pass'],
'program_name': './argv0',
'run_command': 'pass\n',
'use_environment': 1,
'use_environment': True,
'xoptions': [optval],
'use_frozen_modules': expected,
}
@ -1792,9 +1792,9 @@ class MiscTests(EmbeddingTestsMixin, unittest.TestCase):
sys.argv ['./argv0', '-E', 'arg1', 'arg2']
config program_name: ./argv0
config executable: {executable}
config use_environment: 1
config configure_c_stdio: 1
config buffered_stdio: 0
config use_environment: True
config configure_c_stdio: True
config buffered_stdio: False
""").lstrip()
self.assertEqual(out, expected)