diff options
| author | Tzu-ping Chung <uranusjr@gmail.com> | 2022-12-28 10:42:04 +0800 |
|---|---|---|
| committer | Tzu-ping Chung <uranusjr@gmail.com> | 2022-12-28 10:42:04 +0800 |
| commit | 28e5eb99c813ede28f40f53213ae517b6535e38b (patch) | |
| tree | 10fd357b38bf6f7ef47fb1e8cc5af32ca5746f6c | |
| parent | 77ef9f0bfd456a5cd1a3a969072a158e781962d3 (diff) | |
| download | pip-28e5eb99c813ede28f40f53213ae517b6535e38b.tar.gz | |
Avoid unnecessary indirection
Since there's not equivalent of get_isolated_environment_bin_path for
the distutils backend, the additional declaretion in the sysconfig
backend is unnecessary.
| -rw-r--r-- | src/pip/_internal/locations/__init__.py | 2 | ||||
| -rw-r--r-- | src/pip/_internal/locations/_sysconfig.py | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/pip/_internal/locations/__init__.py b/src/pip/_internal/locations/__init__.py index 547bb803c..815f8c22b 100644 --- a/src/pip/_internal/locations/__init__.py +++ b/src/pip/_internal/locations/__init__.py @@ -530,4 +530,4 @@ def get_isolated_environment_lib_paths(prefix: str) -> List[str]: def get_isolated_environment_bin_path(prefix: str) -> str: - return _sysconfig.get_isolated_environment_bin_path(prefix) + return _sysconfig.get_isolated_environment_paths(prefix)["scripts"] diff --git a/src/pip/_internal/locations/_sysconfig.py b/src/pip/_internal/locations/_sysconfig.py index 2bf5a1f44..38e400f94 100644 --- a/src/pip/_internal/locations/_sysconfig.py +++ b/src/pip/_internal/locations/_sysconfig.py @@ -213,7 +213,7 @@ def get_platlib() -> str: return sysconfig.get_paths()["platlib"] -def _get_isolated_environment_paths(prefix: str) -> typing.Dict[str, str]: +def get_isolated_environment_paths(prefix: str) -> typing.Dict[str, str]: variables = {"base": prefix, "platbase": prefix} if "venv" in sysconfig.get_scheme_names(): return sysconfig.get_paths(vars=variables, scheme="venv") @@ -221,10 +221,5 @@ def _get_isolated_environment_paths(prefix: str) -> typing.Dict[str, str]: def get_isolated_environment_lib_paths(prefix: str) -> typing.Tuple[str, str]: - paths = _get_isolated_environment_paths(prefix) + paths = get_isolated_environment_paths(prefix) return (paths["purelib"], paths["platlib"]) - - -def get_isolated_environment_bin_path(prefix: str) -> str: - paths = _get_isolated_environment_paths(prefix) - return paths["scripts"] |