Issue #16993: shutil.which() now preserves the case of the path and extension
on Windows.
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 9c66008..86c32fa 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1093,10 +1093,12 @@
pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
# See if the given file matches any of the expected path extensions.
# This will allow us to short circuit when given "python.exe".
- matches = [cmd for ext in pathext if cmd.lower().endswith(ext.lower())]
# If it does match, only test that one, otherwise we have to try
# others.
- files = [cmd] if matches else [cmd + ext.lower() for ext in pathext]
+ if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
+ files = [cmd]
+ else:
+ files = [cmd + ext for ext in pathext]
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.
@@ -1104,9 +1106,9 @@
seen = set()
for dir in path:
- dir = os.path.normcase(dir)
- if not dir in seen:
- seen.add(dir)
+ normdir = os.path.normcase(dir)
+ if not normdir in seen:
+ seen.add(normdir)
for thefile in files:
name = os.path.join(dir, thefile)
if _access_check(name, mode):
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 01b93fc..6ae051b 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1269,12 +1269,13 @@
class TestWhich(unittest.TestCase):
def setUp(self):
- self.temp_dir = tempfile.mkdtemp()
+ self.temp_dir = tempfile.mkdtemp(prefix="Tmp")
self.addCleanup(shutil.rmtree, self.temp_dir, True)
# Give the temp_file an ".exe" suffix for all.
# It's needed on Windows and not harmful on other platforms.
self.temp_file = tempfile.NamedTemporaryFile(dir=self.temp_dir,
- suffix=".exe")
+ prefix="Tmp",
+ suffix=".Exe")
os.chmod(self.temp_file.name, stat.S_IXUSR)
self.addCleanup(self.temp_file.close)
self.dir, self.file = os.path.split(self.temp_file.name)
@@ -1317,7 +1318,7 @@
# Ask for the file without the ".exe" extension, then ensure that
# it gets found properly with the extension.
rv = shutil.which(self.temp_file.name[:-4], path=self.dir)
- self.assertEqual(self.temp_file.name, rv)
+ self.assertEqual(rv, self.temp_file.name[:-4] + ".exe")
class TestMove(unittest.TestCase):