diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-23 00:49:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 00:49:45 (GMT) |
| commit | e32e79f7d8216b78ac9e61bb1f2eee693108d4ee (patch) | |
| tree | f37f8a85b01f24f9f368dbec764ef38fee0229c2 /Include | |
| parent | 0784a2e5b174d2dbf7b144d480559e650c5cf64c (diff) | |
| download | cpython-e32e79f7d8216b78ac9e61bb1f2eee693108d4ee.zip cpython-e32e79f7d8216b78ac9e61bb1f2eee693108d4ee.tar.gz cpython-e32e79f7d8216b78ac9e61bb1f2eee693108d4ee.tar.bz2 | |
bpo-32030: Move PYTHONPATH to _PyMainInterpreterConfig (#4511)
Move _PyCoreConfig.module_search_path_env to _PyMainInterpreterConfig
structure.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/pylifecycle.h | 2 | ||||
| -rw-r--r-- | Include/pystate.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 2a5e73a..5eaa74e 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -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 diff --git a/Include/pystate.h b/Include/pystate.h index c5d3c33..b2739f1 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -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 */ @@ -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, \ @@ -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 { |