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-135773: have pyvenv.cfg without home key anchor a venv and deduce home (#135831)

Browse source 
This is still formally undefined behaviour, but we may as well
keep the *same* undefined behaviour as previous versions.

PEP 796 proposes a cleaner and more consistent replacement for 3.15+
This commit is contained in:
Richard Levasseur 2025-07-04 06:44:37 -07:00 • committed by GitHub
parent 8ac7613dc8
commit 93263d4314
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/getpath.py
View file

@ -364,10 +364,9 @@ if not py_setpath:
venv_prefix = None
pyvenvcfg = []
# Search for the 'home' key in pyvenv.cfg. Currently, we don't consider the
# presence of a pyvenv.cfg file without a 'home' key to signify the
# existence of a virtual environment — we quietly ignore them.
# XXX: If we don't find a 'home' key, we don't look for another pyvenv.cfg!
# Search for the 'home' key in pyvenv.cfg. If a home key isn't found,
# then it means a venv is active and home is based on the venv's
# executable (if its a symlink, home is where the symlink points).
for line in pyvenvcfg:
key, had_equ, value = line.partition('=')
if had_equ and key.strip().lower() == 'home':
@ -412,10 +411,8 @@ if not py_setpath:
if isfile(candidate):
base_executable = candidate
break
# home key found; stop iterating over lines
break
else:
# We didn't find a 'home' key in pyvenv.cfg (no break), reset venv_prefix.
venv_prefix = None
# ******************************************************************************