Skip to content

bpo-45211: Remember the stdlib dir during startup. #28586

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 4 commits into from
Sep 28, 2021
Merged

bpo-45211: Remember the stdlib dir during startup. #28586

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225302c
Remember the stdlib dir during startup (adding PyConfig.stdlib_dir an…
ericsnowcurrently Jun 12, 2021
9339925
Add sys._get_stdlib_dir().
ericsnowcurrently Sep 21, 2021
1fe1ff7
On Windows, ignore calculate.home for stdlib_dir.
ericsnowcurrently Sep 27, 2021
ca5266e
On Windows expect PyConfig.stdlib_dir to be set for the pyvenv.cfg case.
ericsnowcurrently Sep 27, 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
On Windows expect PyConfig.stdlib_dir to be set for the pyvenv.cfg case.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 27, 2021
commit ca5266ed06b50e1002000aa996529fbbe1039639
8 changes: 5 additions & 3 deletions Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,14 +1352,12 @@ 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:
config['base_prefix'] = pyvenv_home
config['prefix'] = pyvenv_home
config['stdlib_dir'] = os.path.join(pyvenv_home, 'lib')

ver = sys.version_info
dll = f'python{ver.major}'
Expand All @@ -1368,6 +1366,10 @@ def test_init_pyvenv_cfg(self):
dll += '.DLL'
dll = os.path.join(os.path.dirname(executable), dll)
path_config['python3_dll'] = dll
else:
# The current getpath.c doesn't determine the stdlib dir
# in this case.
config['stdlib_dir'] = None

env = self.copy_paths_by_env(config)
self.check_all_configs("test_init_compat_config", config,
Expand Down