Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-107658: Use same logic to look for exec_prefix as for prefix #107661

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

gh-107658: Use same logic to look for exec_prefix as for prefix #107661

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
c321385
Use same logic to look for exec_prefix as for prefix
jpe Aug 5, 2023
b91433e
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 5, 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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-08-05-15-15-09.gh-issue-107658.wGMCYf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use same logic to look for exec_prefix as for prefix
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please explain the new logic here.

6 changes: 6 additions & 0 deletions Modules/getpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,12 @@ def search_up(prefix, *landmarks, test=isfile):
prefix = abspath('')
warn('Could not find platform independent libraries <prefix>')

# First try to detect exec_prefix by looking alongside our runtime library, if known
if library and not exec_prefix:
library_dir = dirname(library)
if PLATSTDLIB_LANDMARK:
if isdir(joinpath(library_dir, PLATSTDLIB_LANDMARK)):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check could also go at line 605 (pre-change; 611 post-change), where it would be with the rest of the search for exec_prefix.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My intent was to mimic the blocks that detect prefix -- the block above corresponds to the block for prefix at 553 (the leading comment is nearly identical) and the block for exec_prefix following it corresponds to the block for prefix at 583. I can see how it might be better to rearrange some of the logic and possibly to create a function that's called for each, but the current patch minimizes the number of changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see what the intent was, but now it's harder to follow because there are two apparently independent blocks for calculating exec_prefix with no obvious reason. So better to merge it into a single block.

exec_prefix = library_dir

# Detect exec_prefix by searching from executable for the platstdlib_dir
if PLATSTDLIB_LANDMARK and not exec_prefix:
Expand Down
Loading