FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-107954, PEP 741: Adjust Python initialization config by vstinner · Pull Request #123663 · python/cpython · GitHub

/ cpython Public

gh-107954, PEP 741: Adjust Python initialization config #123663

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.

Sign up for GitHub

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

Merged
vstinner merged 1 commit into from
Sep 4, 2024
+43 −16
Conversation 0 Commits 1 Checks 0 Files changed 3
Merged

gh-107954, PEP 741: Adjust Python initialization config #123663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (2) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
1 change: 0 additions & 1 deletion Lib/test/test_embed.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,6 @@ def test_initconfig_api(self):
'use_hash_seed': True,
}
config_dev_mode(preconfig, config)
config['faulthandler'] = 0
self.check_all_configs("test_initconfig_api", config, preconfig,
api=API_ISOLATED)

Expand Down
46 changes: 34 additions & 12 deletions Programs/_testembed.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1806,6 +1806,16 @@ static int test_init_set_config(void)
}


static int initconfig_getint(PyInitConfig *config, const char *name)
{
int64_t value;
int res = PyInitConfig_GetInt(config, name, &value);
assert(res == 0);
assert(INT_MIN <= value && value <= INT_MAX);
return (int)value;
}


static int test_initconfig_api(void)
{
PyInitConfig *config = PyInitConfig_Create();
Expand Down Expand Up @@ -1844,7 +1854,6 @@ static int test_initconfig_api(void)
goto error;
}


if (Py_InitializeFromInitConfig(config) < 0) {
goto error;
}
Expand Down Expand Up @@ -1876,38 +1885,51 @@ static int test_initconfig_get_api(void)
assert(PyInitConfig_HasOption(config, "non-existent") == 0);

// test PyInitConfig_GetInt()
int64_t value;
assert(PyInitConfig_GetInt(config, "dev_mode", &value) == 0);
assert(value == 0);
assert(initconfig_getint(config, "dev_mode") == 0);
assert(PyInitConfig_SetInt(config, "dev_mode", 1) == 0);
assert(PyInitConfig_GetInt(config, "dev_mode", &value) == 0);
assert(value == 1);
assert(initconfig_getint(config, "dev_mode") == 1);

// test PyInitConfig_GetInt() on a PyPreConfig option
assert(PyInitConfig_GetInt(config, "utf8_mode", &value) == 0);
assert(value == 0);
assert(initconfig_getint(config, "utf8_mode") == 0);
assert(PyInitConfig_SetInt(config, "utf8_mode", 1) == 0);
assert(PyInitConfig_GetInt(config, "utf8_mode", &value) == 0);
assert(value == 1);
assert(initconfig_getint(config, "utf8_mode") == 1);

// test PyInitConfig_GetStr()
char *str;
assert(PyInitConfig_GetStr(config, "program_name", &str) == 0);
assert(str == NULL);
assert(PyInitConfig_SetStr(config, "program_name", PROGRAM_NAME_UTF8) == 0);
assert(PyInitConfig_GetStr(config, "program_name", &str) == 0);
assert(strcmp(str, PROGRAM_NAME_UTF8) == 0);
free(str);

// test PyInitConfig_GetStrList() and PyInitConfig_FreeStrList()
size_t length;
char **items;
assert(PyInitConfig_GetStrList(config, "xoptions", &length, &items) == 0);
assert(length == 0);

char* xoptions[] = {"faulthandler"};
assert(PyInitConfig_SetStrList(config, "xoptions",
Py_ARRAY_LENGTH(xoptions), xoptions) == 0);
size_t length;
char **items;

assert(PyInitConfig_GetStrList(config, "xoptions", &length, &items) == 0);
assert(length == 1);
assert(strcmp(items[0], "faulthandler") == 0);
PyInitConfig_FreeStrList(length, items);

// Setting hash_seed sets use_hash_seed
assert(initconfig_getint(config, "use_hash_seed") == 0);
assert(PyInitConfig_SetInt(config, "hash_seed", 123) == 0);
assert(initconfig_getint(config, "use_hash_seed") == 1);

// Setting module_search_paths sets module_search_paths_set
assert(initconfig_getint(config, "module_search_paths_set") == 0);
char* paths[] = {"search", "path"};
assert(PyInitConfig_SetStrList(config, "module_search_paths",
Py_ARRAY_LENGTH(paths), paths) == 0);
assert(initconfig_getint(config, "module_search_paths_set") == 1);

return 0;
}

Expand Down
12 changes: 9 additions & 3 deletions Python/initconfig.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,6 @@ PyConfig_InitIsolatedConfig(PyConfig *config)
config->dev_mode = 0;
config->install_signal_handlers = 0;
config->use_hash_seed = 0;
config->faulthandler = 0;
config->tracemalloc = 0;
config->perf_profiling = 0;
config->int_max_str_digits = _PY_LONG_DEFAULT_MAX_STR_DIGITS;
Expand Down Expand Up @@ -3753,7 +3752,7 @@ PyInitConfig_SetInt(PyInitConfig *config, const char *name, int64_t value)
return -1;
}

if (strcmp(name, "hash_seed")) {
if (strcmp(name, "hash_seed") == 0) {
config->config.use_hash_seed = 1;
}

Expand Down Expand Up @@ -3863,7 +3862,14 @@ PyInitConfig_SetStrList(PyInitConfig *config, const char *name,
return -1;
}
PyWideStringList *list = raw_member;
return _PyWideStringList_FromUTF8(config, list, length, items);
if (_PyWideStringList_FromUTF8(config, list, length, items) < 0) {
return -1;
}

if (strcmp(name, "module_search_paths") == 0) {
config->config.module_search_paths_set = 1;
}
return 0;
}


Expand Down
Back | FazBrowse Home | New Git URL