Skip to content

bpo-33499: Fix pymain_init_pycache_prefix() #8596

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
Aug 1, 2018
Merged

bpo-33499: Fix pymain_init_pycache_prefix() #8596

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,16 +1765,6 @@ pymain_init_tracemalloc(_PyCoreConfig *config)
static _PyInitError
pymain_init_pycache_prefix(_PyCoreConfig *config)
{
wchar_t *env;

int res = config_get_env_var_dup(config, &env,
L"PYTHONPYCACHEPREFIX", "PYTHONPYCACHEPREFIX");
if (res < 0) {
return DECODE_LOCALE_ERR("PYTHONPYCACHEPREFIX", res);
} else if (env) {
config->pycache_prefix = env;
}

const wchar_t *xoption = config_get_xoption(config, L"pycache_prefix");
if (xoption) {
const wchar_t *sep = wcschr(xoption, L'=');
Expand All @@ -1787,6 +1777,16 @@ pymain_init_pycache_prefix(_PyCoreConfig *config)
// -X pycache_prefix= can cancel the env var
config->pycache_prefix = NULL;
}
return _Py_INIT_OK();
}

wchar_t *env;
int res = config_get_env_var_dup(config, &env,
L"PYTHONPYCACHEPREFIX", "PYTHONPYCACHEPREFIX");
if (res < 0) {
return DECODE_LOCALE_ERR("PYTHONPYCACHEPREFIX", res);
} else if (env) {
config->pycache_prefix = env;
}

return _Py_INIT_OK();
Expand Down