McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Don't enable global site when enabling user site

Browse source
This commit is contained in:
Tzu-ping Chung 2022-07-22 18:04:28 +08:00
parent 1d05ba8ffd
commit 4d533cc269
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/lib/venv.py
View file

@ -91,10 +91,10 @@ class VirtualEnvironment:
def _customize_site(self) -> None:
# Enable user site (before system).
contents = textwrap.dedent(
"""
f"""
import os, site, sys
if not os.environ.get('PYTHONNOUSERSITE', False):
site.ENABLE_USER_SITE = True
site.ENABLE_USER_SITE = {self._user_site_packages}
# First, drop system-sites related paths.
original_sys_path = sys.path[:]
known_paths = set()
@ -106,7 +106,8 @@ class VirtualEnvironment:
original_sys_path.remove(path)
sys.path = original_sys_path
# Second, add user-site.
site.addsitedir(site.getusersitepackages())
if {self._user_site_packages}:
site.addsitedir(site.getusersitepackages())
# Third, add back system-sites related paths.
for path in site.getsitepackages():
site.addsitedir(path)
@ -142,12 +143,5 @@ class VirtualEnvironment:
@user_site_packages.setter
def user_site_packages(self, value: bool) -> None:
self._user_site_packages = value
self._customize_site()
pyvenv_cfg = self.location.joinpath("pyvenv.cfg")
modified_lines = []
for line in pyvenv_cfg.read_text().splitlines():
k, v = line.split("=", 1)
if k.strip() == "include-system-site-packages":
line = f"include-system-site-packages = {str(bool(value)).lower()}"
modified_lines.append(line)
pyvenv_cfg.write_text("\n".join(modified_lines))