Skip to content
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

bpo-32030: Move PYTHONPATH to _PyMainInterpreterConfig #4511

Merged
merged 2 commits into from
Nov 23, 2017
Merged

bpo-32030: Move PYTHONPATH to _PyMainInterpreterConfig #4511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
338f7d2
bpo-32030: Move PYTHONPATH to _PyMainInterpreterConfig
vstinner Nov 23, 2017
69d9438
Fix Windows
vstinner Nov 23, 2017
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
2 changes: 1 addition & 1 deletion Include/pylifecycle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ PyAPI_FUNC(wchar_t *) Py_GetPrefix(void);
PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);
PyAPI_FUNC(wchar_t *) Py_GetPath(void);
#ifdef Py_BUILD_CORE
PyAPI_FUNC(wchar_t *) _Py_GetPathWithConfig(_PyCoreConfig *config);
PyAPI_FUNC(wchar_t *) _Py_GetPathWithConfig(_PyMainInterpreterConfig *config);
#endif
PyAPI_FUNC(void) Py_SetPath(const wchar_t *);
#ifdef MS_WINDOWS
Expand Down
6 changes: 3 additions & 3 deletions Include/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ typedef struct {
unsigned long hash_seed;
int _disable_importlib; /* Needed by freeze_importlib */
const char *allocator; /* Memory allocator: _PyMem_SetupAllocators() */
wchar_t *module_search_path_env; /* PYTHONPATH environment variable */
int dev_mode; /* -X dev */
int faulthandler; /* -X faulthandler */
int tracemalloc; /* -X tracemalloc=N */
Expand All @@ -46,7 +45,6 @@ typedef struct {
.hash_seed = 0, \
._disable_importlib = 0, \
.allocator = NULL, \
.module_search_path_env = NULL, \
.dev_mode = 0, \
.faulthandler = 0, \
.tracemalloc = 0, \
Expand All @@ -62,11 +60,13 @@ typedef struct {
*/
typedef struct {
int install_signal_handlers;
wchar_t *module_search_path_env; /* PYTHONPATH environment variable */
} _PyMainInterpreterConfig;

#define _PyMainInterpreterConfig_INIT \
(_PyMainInterpreterConfig){\
.install_signal_handlers = -1}
.install_signal_handlers = -1, \
.module_search_path_env = NULL}

typedef struct _is {

Expand Down
18 changes: 9 additions & 9 deletions Modules/getpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ search_for_exec_prefix(wchar_t *argv0_path, wchar_t *home,
}

static void
calculate_path(_PyCoreConfig *core_config)
calculate_path(_PyMainInterpreterConfig *config)
{
extern wchar_t *Py_GetProgramName(void);

Expand Down Expand Up @@ -706,9 +706,9 @@ calculate_path(_PyCoreConfig *core_config)
bufsz = 0;

wchar_t *env_path = NULL;
if (core_config) {
if (core_config->module_search_path_env) {
bufsz += wcslen(core_config->module_search_path_env) + 1;
if (config) {
if (config->module_search_path_env) {
bufsz += wcslen(config->module_search_path_env) + 1;
}
}
else {
Expand Down Expand Up @@ -752,9 +752,9 @@ calculate_path(_PyCoreConfig *core_config)

/* Run-time value of $PYTHONPATH goes first */
buf[0] = '\0';
if (core_config) {
if (core_config->module_search_path_env) {
wcscpy(buf, core_config->module_search_path_env);
if (config) {
if (config->module_search_path_env) {
wcscpy(buf, config->module_search_path_env);
wcscat(buf, delimiter);
}
}
Expand Down Expand Up @@ -858,10 +858,10 @@ Py_SetPath(const wchar_t *path)
}

wchar_t *
_Py_GetPathWithConfig(_PyCoreConfig *core_config)
_Py_GetPathWithConfig(_PyMainInterpreterConfig *config)
{
if (!module_search_path) {
calculate_path(core_config);
calculate_path(config);
}
return module_search_path;
}
Expand Down
18 changes: 9 additions & 9 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ typedef struct {
/* non-zero is stdin is a TTY or if -i option is used */
int stdin_is_interactive;
_PyCoreConfig core_config;
_PyMainInterpreterConfig config;
_Py_CommandLineDetails cmdline;
PyObject *main_importer_path;
/* non-zero if filename, command (-c) or module (-m) is set
Expand All @@ -409,6 +410,7 @@ typedef struct {
{.status = 0, \
.cf = {.cf_flags = 0}, \
.core_config = _PyCoreConfig_INIT, \
.config = _PyMainInterpreterConfig_INIT, \
.main_importer_path = NULL, \
.run_code = -1, \
.program_name = NULL, \
Expand Down Expand Up @@ -442,7 +444,7 @@ pymain_free_impl(_PyMain *pymain)
Py_CLEAR(pymain->main_importer_path);
PyMem_RawFree(pymain->program_name);

PyMem_RawFree(pymain->core_config.module_search_path_env);
PyMem_RawFree(pymain->config.module_search_path_env);

#ifdef __INSURE__
/* Insure++ is a memory analysis tool that aids in discovering
Expand Down Expand Up @@ -957,20 +959,16 @@ pymain_get_program_name(_PyMain *pymain)
static int
pymain_init_main_interpreter(_PyMain *pymain)
{
_PyMainInterpreterConfig config = _PyMainInterpreterConfig_INIT;
_PyInitError err;

/* TODO: Moar config options! */
config.install_signal_handlers = 1;

/* TODO: Print any exceptions raised by these operations */
err = _Py_ReadMainInterpreterConfig(&config);
err = _Py_ReadMainInterpreterConfig(&pymain->config);
if (_Py_INIT_FAILED(err)) {
pymain->err = err;
return -1;
}

err = _Py_InitializeMainInterpreter(&config);
err = _Py_InitializeMainInterpreter(&pymain->config);
if (_Py_INIT_FAILED(err)) {
pymain->err = err;
return -1;
Expand Down Expand Up @@ -1387,7 +1385,7 @@ pymain_init_pythonpath(_PyMain *pymain)
return -1;
}

pymain->core_config.module_search_path_env = path2;
pymain->config.module_search_path_env = path2;
#else
char *path = pymain_get_env_var("PYTHONPATH");
if (!path) {
Expand All @@ -1405,7 +1403,7 @@ pymain_init_pythonpath(_PyMain *pymain)
}
return -1;
}
pymain->core_config.module_search_path_env = wpath;
pymain->config.module_search_path_env = wpath;
#endif
return 0;
}
Expand Down Expand Up @@ -1574,6 +1572,8 @@ pymain_init(_PyMain *pymain)
}

pymain->core_config._disable_importlib = 0;
/* TODO: Moar config options! */
pymain->config.install_signal_handlers = 1;

orig_argc = pymain->argc; /* For Py_GetArgcArgv() */
orig_argv = pymain->argv;
Expand Down
10 changes: 5 additions & 5 deletions PC/getpathp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ read_pth_file(const wchar_t *path, wchar_t *prefix, int *isolated, int *nosite)


static void
calculate_path(_PyCoreConfig *core_config)
calculate_path(_PyMainInterpreterConfig *config)
{
wchar_t argv0_path[MAXPATHLEN+1];
wchar_t *buf;
Expand All @@ -637,8 +637,8 @@ calculate_path(_PyCoreConfig *core_config)
wchar_t *userpath = NULL;
wchar_t zip_path[MAXPATHLEN+1];

if (core_config) {
envpath = core_config->module_search_path_env;
if (config) {
envpath = config->module_search_path_env;
}
else if (!Py_IgnoreEnvironmentFlag) {
envpath = _wgetenv(L"PYTHONPATH");
Expand Down Expand Up @@ -899,10 +899,10 @@ Py_SetPath(const wchar_t *path)
}

wchar_t *
_Py_GetPathWithConfig(_PyCoreConfig *core_config)
_Py_GetPathWithConfig(_PyMainInterpreterConfig *config)
{
if (!module_search_path) {
calculate_path(core_config);
calculate_path(config);
}
return module_search_path;
}
Expand Down
4 changes: 2 additions & 2 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ _Py_InitializeMainInterpreter(const _PyMainInterpreterConfig *config)
/* GetPath may initialize state that _PySys_EndInit locks
in, and so has to be called first. */
/* TODO: Call Py_GetPath() in Py_ReadConfig, rather than here */
wchar_t *sys_path = _Py_GetPathWithConfig(&interp->core_config);
wchar_t *sys_path = _Py_GetPathWithConfig(&interp->config);

if (interp->core_config._disable_importlib) {
/* Special mode for freeze_importlib: run with no import system
Expand Down Expand Up @@ -1301,7 +1301,7 @@ new_interpreter(PyThreadState **tstate_p)

/* XXX The following is lax in error checking */

wchar_t *sys_path = _Py_GetPathWithConfig(&interp->core_config);
wchar_t *sys_path = _Py_GetPathWithConfig(&interp->config);

PyObject *modules = PyDict_New();
if (modules == NULL) {
Expand Down