From 57d34e0d9b41d14ae91942b97ac8d1eb1cd6d162 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Tue, 5 Nov 2019 14:54:52 +0530 Subject: [PATCH] Allow whitespace in pyvenv.cfg --- src/pip/_internal/utils/virtualenv.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pip/_internal/utils/virtualenv.py b/src/pip/_internal/utils/virtualenv.py index ffc401ad104..d81e6ac54bb 100644 --- a/src/pip/_internal/utils/virtualenv.py +++ b/src/pip/_internal/utils/virtualenv.py @@ -2,6 +2,7 @@ import logging import os +import re import site import sys @@ -11,6 +12,9 @@ from typing import List, Optional logger = logging.getLogger(__name__) +_INCLUDE_SYSTEM_SITE_PACKAGES_REGEX = re.compile( + r"include-system-site-packages\s*=\s*(?Ptrue|false)" +) def _running_under_venv(): @@ -76,7 +80,11 @@ def _no_global_under_venv(): ) return True - return "include-system-site-packages = false" in cfg_lines + for line in cfg_lines: + match = _INCLUDE_SYSTEM_SITE_PACKAGES_REGEX.match(line) + if match is not None and match.group('value') == 'false': + return True + return False def _no_global_under_regular_virtualenv():