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

Skip to content

gh-127001: Fix PATHEXT issues in shutil.which() on Windows #127035

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

Merged
serhiy-storchaka merged 8 commits into from
Nov 22, 2024
Merged

gh-127001: Fix PATHEXT issues in shutil.which() on Windows #127035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2ec0f6
gh-127001: Fix conflict with extensionless files in shutil.which() on…
serhiy-storchaka Nov 19, 2024
851c4c2
Rewrite tests and support . in PATHEXT.
serhiy-storchaka Nov 22, 2024
2258182
Update comment.
serhiy-storchaka Nov 22, 2024
e1b862b
Add a NEWS entry.
serhiy-storchaka Nov 22, 2024
b72facb
Test full match with multidot extension
serhiy-storchaka Nov 22, 2024
e494730
Polishing.
serhiy-storchaka Nov 22, 2024
db4ab95
Remove an outdated bugfix versionchanged.
serhiy-storchaka Nov 22, 2024
e49c75f
Support PATHEXT extension that ends with a dot.
serhiy-storchaka Nov 22, 2024
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
Next Next commit
gh-127001: Fix conflict with extensionless files in shutil.which() on… 
… Windows

Name without a PATHEXT extension is only searched if the mode does not
include X_OK.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Nov 19, 2024
commit b2ec0f6e87bcaf403542ef561434b03c865117a2
10 changes: 5 additions & 5 deletions Lib/shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,16 +1555,16 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
if use_bytes:
pathext = [os.fsencode(ext) for ext in pathext]

files = ([cmd] + [cmd + ext for ext in pathext])
files = [cmd + ext for ext in pathext]

# gh-109590. If we are looking for an executable, we need to look
# for a PATHEXT match. The first cmd is the direct match
# (e.g. python.exe instead of python)
# Check that direct match first if and only if the extension is in PATHEXT
# Otherwise check it last
suffix = os.path.splitext(files[0])[1].upper()
if mode & os.X_OK and not any(suffix == ext.upper() for ext in pathext):
files.append(files.pop(0))
normcmd = cmd.upper()
if not (mode & os.X_OK) or any(normcmd.endswith(ext.upper()) for ext in pathext):
files.insert(0, cmd)
else:
# On other platforms you don't have things like PATHEXT to tell you
# what file suffixes are executable, so just pass on cmd as-is.
Expand All @@ -1573,7 +1573,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
seen = set()
for dir in path:
normdir = os.path.normcase(dir)
if not normdir in seen:
if normdir not in seen:
seen.add(normdir)
for thefile in files:
name = os.path.join(dir, thefile)
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2592,8 +2592,8 @@ def test_pathext_preferred_for_execute(self):
open(exe, 'w').close()
os.chmod(exe, 0o755)

# default behavior allows a direct match if nothing in PATHEXT matches
self.assertEqual(shutil.which(self.to_text_type("test.exe")), exe)
self.assertIsNone(shutil.which(self.to_text_type("test.exe")))
self.assertEqual(shutil.which(self.to_text_type("test.exe"), mode=os.F_OK), exe)

dot_test = os.path.join(self.temp_dir, self.to_text_type("test.exe.test"))
open(dot_test, 'w').close()
Expand Down