mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

GH-126985: Don't override venv detection with PYTHONHOME (#127968)

Browse source
This commit is contained in:
Filipe Laíns 🇵🇸 2024-12-15 21:12:13 +00:00 • committed by GitHub
parent 46006a1b35
commit b74c8f58e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/getpath.py
View file

@ -344,9 +344,10 @@ elif use_environment and ENV_PYTHONHOME and not py_setpath:
venv_prefix = None
# Calling Py_SetPythonHome(), Py_SetPath() or
# setting $PYTHONHOME will override venv detection.
if not home and not py_setpath:
# Calling Py_SetPath() will override venv detection.
# Calling Py_SetPythonHome() or setting $PYTHONHOME will override the 'home' key
# specified in pyvenv.cfg.
if not py_setpath:
try:
# prefix2 is just to avoid calculating dirname again later,
# as the path in venv_prefix is the more common case.
@ -370,6 +371,9 @@ if not home and not py_setpath:
for line in pyvenvcfg:
key, had_equ, value = line.partition('=')
if had_equ and key.strip().lower() == 'home':
# If PYTHONHOME was set, ignore 'home' from pyvenv.cfg.
if home:
break
# Override executable_dir/real_executable_dir with the value from 'home'.
# These values may be later used to calculate prefix/base_prefix, if a more
# reliable source — like the runtime library (libpython) path — isn't available.