Skip to content

bpo-45020: Default to using frozen modules unless running from source tree. #28940

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
ericsnowcurrently merged 11 commits into from
Oct 16, 2021
Merged

bpo-45020: Default to using frozen modules unless running from source tree. #28940

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cc59209
Add a NEWS entry.
ericsnowcurrently Aug 31, 2021
0cefeaf
Identify whether or not the executable is running installed (adding _…
ericsnowcurrently Aug 31, 2021
03d7d26
Default to "off" if in development.
ericsnowcurrently Aug 31, 2021
5db164b
Fix test_embed so it runs with out-of-tree builds.
ericsnowcurrently Oct 13, 2021
e9cce77
Use the active config to decide "is dev env".
ericsnowcurrently Oct 13, 2021
dc832f5
Drop extraneous changes.
ericsnowcurrently Oct 13, 2021
e26cc55
Fix test_embed on Windows.
ericsnowcurrently Oct 13, 2021
69242c0
Drop an outdated TODO comment.
ericsnowcurrently Oct 13, 2021
b2aa67d
Use sys._stdlib_dir to find the stdlib dir.
ericsnowcurrently Oct 13, 2021
fc7a72f
Drop an outdated env var.
ericsnowcurrently Oct 13, 2021
f1d3878
Fix test_embed when "python3" isn't on $PATH.
ericsnowcurrently Oct 16, 2021
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
Prev Previous commit
Next Next commit
Default to "off" if in development.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 14, 2021
commit 03d7d2609f474ab28a6e948bb228b08cc99874bc
3 changes: 2 additions & 1 deletion Doc/using/cmdline.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ Miscellaneous options
* ``-X frozen_modules`` determines whether or not frozen modules are
ignored by the import machinery. A value of "on" means they get
imported and "off" means they are ignored. The default is "on"
for non-debug builds (the normal case) and "off" for debug builds.
if this is an installed Python (the normal case). If it's under
development (running from the source tree) then the default is "off".
Note that the "importlib_bootstrap" and "importlib_bootstrap_external"
frozen modules are always used, even if this flag is set to "off".

Expand Down
9 changes: 7 additions & 2 deletions Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'pathconfig_warnings': 1,
'_init_main': 1,
'_isolated_interpreter': 0,
'use_frozen_modules': 0,
'use_frozen_modules': GET_DEFAULT_CONFIG,
}
if MS_WINDOWS:
CONFIG_COMPAT.update({
Expand Down Expand Up @@ -1265,7 +1265,9 @@ def test_init_setpythonhome(self):
'stdlib_dir': stdlib,
}
self.default_program_name(config)
env = {'TESTHOME': home, 'PYTHONPATH': paths_str}
env = {'TESTHOME': home,
'PYTHONPATH': paths_str,
'_PYTHONTESTFROZENMODULES': '1'}
self.check_all_configs("test_init_setpythonhome", config,
api=API_COMPAT, env=env)

Expand Down Expand Up @@ -1355,6 +1357,9 @@ def test_init_pyvenv_cfg(self):
'base_executable': executable,
'executable': executable,
'module_search_paths': paths,
# The current getpath.c doesn't determine the stdlib dir
# in this case.
'stdlib_dir': None,
}
path_config = {}
if MS_WINDOWS:
Expand Down
4 changes: 1 addition & 3 deletions Python/initconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2103,9 +2103,7 @@ config_init_import(PyConfig *config, int compute_path_config)
/* -X frozen_modules=[on|off] */
const wchar_t *value = config_get_xoption_value(config, L"frozen_modules");
if (value == NULL) {
// For now we always default to "off".
// In the near future we will be factoring in PGO and in-development.
config->use_frozen_modules = 0;
config->use_frozen_modules = _Py_IsDevelopmentEnv();
}
else if (wcscmp(value, L"on") == 0) {
config->use_frozen_modules = 1;
Expand Down