Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Incorrect sys.path Sanitization Logic for Linked Directories #168

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix for Incorrect sys.path Sanitization Logic for Linked Directories #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
465910d
Updated sys.path sanitizing logic.
MrFlynn Nov 8, 2023
847e138
Quick fix for failing sanitize_sys_path tests on Windows.
MrFlynn Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions relenv/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,9 @@ def sanitize_sys_path(sys_path_entries):
for __path in sys_path_entries:
for __valid_path_prefix in __valid_path_prefixes:
try:
pathlib.Path(__path).relative_to(__valid_path_prefix)
__sys_path.append(__path)
__resolved_path = pathlib.Path(__path).resolve()
__resolved_path.relative_to(__valid_path_prefix)
__sys_path.append(str(__resolved_path))
except ValueError:
continue
if "PYTHONPATH" in os.environ:
Expand Down
10 changes: 6 additions & 4 deletions tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,14 @@ def test_relative_interpreter_scripts_not_relative_to_root():

def test_sanitize_sys_path():
if sys.platform.startswith("win"):
path_prefix = "c:\\"
path_prefix = "C:\\"
separator = "\\"
else:
path_prefix = "/"
python_path_entries = [f"{path_prefix}blah/blah", f"{path_prefix}yada/yada"]
expected = [f"{path_prefix}foo/1", f"{path_prefix}bar/2"] + python_path_entries
sys_path = [f"{path_prefix}foo/1", f"{path_prefix}bar/2", f"{path_prefix}lib/3"]
separator = "/"
python_path_entries = [f"{path_prefix}blah{separator}blah", f"{path_prefix}yada{separator}yada"]
expected = [f"{path_prefix}foo{separator}1", f"{path_prefix}bar{separator}2"] + python_path_entries
sys_path = [f"{path_prefix}foo{separator}1", f"{path_prefix}bar{separator}2", f"{path_prefix}lib{separator}3"]
with patch.object(sys, "prefix", f"{path_prefix}foo"), patch.object(
sys, "base_prefix", f"{path_prefix}bar"
), patch.dict(os.environ, PYTHONPATH=os.pathsep.join(python_path_entries)):
Expand Down
Loading