From 1648efdb14aa41800e30d5a7ebbf15cd074ecbd7 Mon Sep 17 00:00:00 2001 From: Frost Ming Date: Tue, 5 Jan 2021 15:42:43 +0800 Subject: [PATCH] fix path manipulation Close #215 --- news/215.bugfix | 1 + pdm/cli/actions.py | 5 +---- pdm/cli/utils.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 news/215.bugfix diff --git a/news/215.bugfix b/news/215.bugfix new file mode 100644 index 00000000..93a3fb65 --- /dev/null +++ b/news/215.bugfix @@ -0,0 +1 @@ +Fix a bug of `PYTHONPATH` manipulation under Windows platform. diff --git a/pdm/cli/actions.py b/pdm/cli/actions.py index 041db9b5..84adba25 100644 --- a/pdm/cli/actions.py +++ b/pdm/cli/actions.py @@ -1,7 +1,6 @@ import json import os import shutil -import sys from pathlib import Path from typing import Dict, Iterable, List, Optional, Sequence @@ -31,9 +30,7 @@ from pdm.project import Project from pdm.resolver import resolve from pdm.utils import get_python_version, setdefault -PEP582_PATH = os.path.join( - os.path.dirname(sys.modules[__name__.split(".")[0]].__file__), "pep582" -) +PEP582_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), "pep582") def do_lock( diff --git a/pdm/cli/utils.py b/pdm/cli/utils.py index 05bd8219..16b6dc68 100644 --- a/pdm/cli/utils.py +++ b/pdm/cli/utils.py @@ -424,7 +424,7 @@ def set_env_in_reg(env_name: str, value: str) -> None: return except FileNotFoundError: old_value, type_ = "", winreg.REG_EXPAND_SZ - new_value = ";".join(old_value, value) if old_value else value + new_value = os.pathsep.join([old_value, value]) if old_value else value try: winreg.SetValueEx(env_key, env_name, 0, type_, new_value) except PermissionError: -- GitLab