greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-106718: Treat PyConfig.stdlib_dir as highest-priority setting for stdlib_dir when calculating paths (GH-108730)

Browse Source
This commit is contained in:
Yilei Yang
2023-11-01 14:11:18 -07:00
committed by GitHub
parent 821a7ac493
commit 834b7c18d7
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/getpath.py
View File

@@ -229,9 +229,10 @@ use_environment = config.get('use_environment', 1)
pythonpath = config.get('module_search_paths')
pythonpath_was_set = config.get('module_search_paths_set')
stdlib_dir = config.get('stdlib_dir')
stdlib_dir_was_set_in_config = bool(stdlib_dir)
real_executable_dir = None
stdlib_dir = None
platstdlib_dir = None
# ******************************************************************************
@@ -507,11 +508,12 @@ if ((not home_was_set and real_executable_dir and not py_setpath)
build_stdlib_prefix = build_prefix
else:
build_stdlib_prefix = search_up(build_prefix, *BUILDSTDLIB_LANDMARKS)
# Always use the build prefix for stdlib
if build_stdlib_prefix:
stdlib_dir = joinpath(build_stdlib_prefix, 'Lib')
else:
stdlib_dir = joinpath(build_prefix, 'Lib')
# Use the build prefix for stdlib when not explicitly set
if not stdlib_dir_was_set_in_config:
if build_stdlib_prefix:
stdlib_dir = joinpath(build_stdlib_prefix, 'Lib')
else:
stdlib_dir = joinpath(build_prefix, 'Lib')
# Only use the build prefix for prefix if it hasn't already been set
if not prefix:
prefix = build_stdlib_prefix
@@ -543,8 +545,9 @@ else:
prefix, had_delim, exec_prefix = home.partition(DELIM)
if not had_delim:
exec_prefix = prefix
# Reset the standard library directory if it was already set
stdlib_dir = None
# Reset the standard library directory if it was not explicitly set
if not stdlib_dir_was_set_in_config:
stdlib_dir = None
# First try to detect prefix by looking alongside our runtime library, if known
@@ -560,7 +563,8 @@ else:
if STDLIB_SUBDIR and STDLIB_LANDMARKS and not prefix:
if any(isfile(joinpath(library_dir, f)) for f in STDLIB_LANDMARKS):
prefix = library_dir
stdlib_dir = joinpath(prefix, STDLIB_SUBDIR)
if not stdlib_dir_was_set_in_config:
stdlib_dir = joinpath(prefix, STDLIB_SUBDIR)
# Detect prefix by looking for zip file
@@ -571,7 +575,7 @@ else:
prefix = executable_dir
else:
prefix = search_up(executable_dir, ZIP_LANDMARK)
if prefix:
if prefix and not stdlib_dir_was_set_in_config:
stdlib_dir = joinpath(prefix, STDLIB_SUBDIR)
if not isdir(stdlib_dir):
stdlib_dir = None