diff options
author | Carl Meyer <carl@oddbird.net> | 2018-06-16 04:40:56 (GMT) |
---|---|---|
committer | Nick Coghlan <ncoghlan@gmail.com> | 2018-06-16 04:40:56 (GMT) |
commit | b193fa996a746111252156f11fb14c12fd6267e6 (patch) | |
tree | 1995957ce580ba762a19f64e41db2db32aec096a /Modules | |
parent | 68680035143a3a6398faa88f067f244c74691d19 (diff) | |
download | cpython-b193fa996a746111252156f11fb14c12fd6267e6.zip cpython-b193fa996a746111252156f11fb14c12fd6267e6.tar.gz cpython-b193fa996a746111252156f11fb14c12fd6267e6.tar.bz2 |
bpo-33499: Add PYTHONPYCACHEPREFIX env var for alt bytecode cache location. (GH-6834)
In some development setups it is inconvenient or impossible to write bytecode
caches to the code tree, but the bytecode caches are still useful. The
PYTHONPYCACHEPREFIX environment variable allows specifying an alternate
location for cached bytecode files, within which a directory tree mirroring the code
tree will be created. This cache tree is then used (for both reading and writing)
instead of the local `__pycache__` subdirectory within each source directory.
Exposed at runtime as sys.pycache_prefix (defaulting to None), and can
be set from the CLI as "-X pycache_prefix=path".
Patch by Carl Meyer.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/main.c | 51 |
1 files changed, 50 insertions, 1 deletions
diff --git a/Modules/main.c b/Modules/main.c index 3809fa4..6067d5e 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -144,7 +144,8 @@ static const char usage_6[] = "PYTHONCOERCECLOCALE: if this variable is set to 0, it disables the locale\n" " coercion behavior. Use PYTHONCOERCECLOCALE=warn to request display of\n" " locale coercion and locale compatibility warnings on stderr.\n" -"PYTHONDEVMODE: enable the development mode.\n"; +"PYTHONDEVMODE: enable the development mode.\n" +"PYTHONPYCACHEPREFIX: root directory for bytecode cache (pyc) files.\n"; static void pymain_usage(int error, const wchar_t* program) @@ -1675,6 +1676,37 @@ pymain_init_tracemalloc(_PyCoreConfig *config) } +static _PyInitError +pymain_init_pycache_prefix(_PyCoreConfig *config) +{ + wchar_t *env; + + int res = config_get_env_var_dup( + &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'='); + if (sep && wcslen(sep) > 1) { + config->pycache_prefix = _PyMem_RawWcsdup(sep + 1); + if (config->pycache_prefix == NULL) { + return _Py_INIT_NO_MEMORY(); + } + } else { + // -X pycache_prefix= can cancel the env var + config->pycache_prefix = NULL; + } + } + + return _Py_INIT_OK(); +} + + static void get_env_flag(int *flag, const char *name) { @@ -1868,6 +1900,12 @@ config_read_complex_options(_PyCoreConfig *config) if (_Py_INIT_FAILED(err)) { return err; } + + err = pymain_init_pycache_prefix(config); + if (_Py_INIT_FAILED(err)) { + return err; + } + return _Py_INIT_OK(); } @@ -2238,6 +2276,7 @@ _PyCoreConfig_Clear(_PyCoreConfig *config) LIST = NULL; \ } while (0) + CLEAR(config->pycache_prefix); CLEAR(config->module_search_path_env); CLEAR(config->home); CLEAR(config->program_name); @@ -2302,6 +2341,7 @@ _PyCoreConfig_Copy(_PyCoreConfig *config, const _PyCoreConfig *config2) COPY_ATTR(malloc_stats); COPY_ATTR(utf8_mode); + COPY_STR_ATTR(pycache_prefix); COPY_STR_ATTR(module_search_path_env); COPY_STR_ATTR(home); COPY_STR_ATTR(program_name); @@ -2337,6 +2377,7 @@ _PyMainInterpreterConfig_Clear(_PyMainInterpreterConfig *config) Py_CLEAR(config->warnoptions); Py_CLEAR(config->xoptions); Py_CLEAR(config->module_search_path); + Py_CLEAR(config->pycache_prefix); } @@ -2389,6 +2430,7 @@ _PyMainInterpreterConfig_Copy(_PyMainInterpreterConfig *config, COPY_ATTR(warnoptions); COPY_ATTR(xoptions); COPY_ATTR(module_search_path); + COPY_ATTR(pycache_prefix); #undef COPY_ATTR return 0; } @@ -2446,6 +2488,13 @@ _PyMainInterpreterConfig_Read(_PyMainInterpreterConfig *main_config, COPY_WSTRLIST(main_config->module_search_path, config->nmodule_search_path, config->module_search_paths); + + if (config->pycache_prefix != NULL) { + COPY_WSTR(pycache_prefix); + } else { + main_config->pycache_prefix = NULL; + } + } return _Py_INIT_OK(); |