PR updates

python · zooba · Apr 4, 2023 · Apr 2, 2023 · Apr 2, 2023 · Apr 2, 2023
commit fa145da4e2ee79055e1e03558fefc59807f91421
@@ -41,11 +41,7 @@
     import nt
 
 if sys.platform == 'win32':
-    try:
-        import ctypes
-        _CTYPES_SUPPORTED = True
-    except ImportError:
-        _CTYPES_SUPPORTED = False
+    import _winapi
 
 COPY_BUFSIZE = 1024 * 1024 if _WINDOWS else 64 * 1024
 # This should never be removed, see rationale in:
@@ -1456,16 +1452,13 @@ def _access_check(fn, mode):
             and not os.path.isdir(fn))
 
 
-def _win32_need_current_directory_for_exe_path(cmd):
+def _win_path_needs_curdir(cmd, mode):
     """
-    On Windows, we can use NeedCurrentDirectoryForExePathW to figure out
-    if we should add the cwd to PATH when searching for executables.
-
-    If we don't have ctypes, we'll fallback to old behavior which is to always add cwd.
+    On Windows, we can use NeedCurrentDirectoryForExePath to figure out
+    if we should add the cwd to PATH when searching for executables if
+    the mode is executable.
     """
-    if _CTYPES_SUPPORTED:
-        return bool(ctypes.windll.kernel32.NeedCurrentDirectoryForExePathW(cmd))
-    return True
+    return mode & os.X_OK and _winapi.NeedCurrentDirectoryForExePath(cmd if isinstance(cmd, str) else os.fsdecode(cmd))
 
 
 def which(cmd, mode=os.F_OK | os.X_OK, path=None):
@@ -1510,7 +1503,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
             path = os.fsdecode(path)
             path = path.split(os.pathsep)
 
-        if sys.platform == "win32" and _win32_need_current_directory_for_exe_path(cmd):
+        if sys.platform == "win32" and _win_path_needs_curdir(cmd, mode):
             curdir = os.curdir
             if use_bytes:
                 curdir = os.fsencode(curdir)
@@ -1519,7 +1512,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
 
     if sys.platform == "win32":
         # PATHEXT is necessary to check on Windows.
-        pathext_source = os.getenv("PATHEXT", _WIN_DEFAULT_PATHEXT)
+        pathext_source = os.getenv("PATHEXT") or _WIN_DEFAULT_PATHEXT
         pathext = [ext for ext in pathext_source.split(os.pathsep) if ext]
 
         if use_bytes:

@@ -2049,11 +2049,11 @@ def test_cwd_non_win32(self):
     def test_cwd_win32(self):
         base_dir = os.path.dirname(self.dir)
         with os_helper.change_cwd(path=self.dir):
-            with unittest.mock.patch('shutil._win32_need_current_directory_for_exe_path', return_value=True):
+            with unittest.mock.patch('shutil._win_path_needs_curdir', return_value=True):
                 rv = shutil.which(self.file, path=base_dir)
                 # Current directory implicitly on PATH
                 self.assertEqual(rv, os.path.join(self.curdir, self.file))
-            with unittest.mock.patch('shutil._win32_need_current_directory_for_exe_path', return_value=False):
+            with unittest.mock.patch('shutil._win_path_needs_curdir', return_value=False):
                 rv = shutil.which(self.file, path=base_dir)
                 # Current directory not on PATH
                 self.assertIsNone(rv)
@@ -2205,18 +2205,13 @@ def test_pathext_applied_on_files_in_path(self):
 
     # See GH-75586
     @unittest.skipUnless(sys.platform == "win32", 'test specific to Windows')
-    def test_win32_need_current_directory_for_exe_path_true_without_ctypes(self):
-        with unittest.mock.patch('shutil._CTYPES_SUPPORTED', False):
-            self.assertTrue(shutil._win32_need_current_directory_for_exe_path('anything'))
-
-    # See GH-75586
-    @unittest.skipUnless(sys.platform == "win32", 'test specific to Windows')
-    def test_win32_need_current_directory_for_exe_path_with_ctypes(self):
-        with unittest.mock.patch('shutil._CTYPES_SUPPORTED', True):
-            with unittest.mock.patch('shutil.ctypes') as ctypes_mock:
-                ctypes_mock.windll.kernel32.NeedCurrentDirectoryForExePathW.return_value = 0
-                self.assertFalse(shutil._win32_need_current_directory_for_exe_path('test.exe'))
-                ctypes_mock.windll.kernel32.NeedCurrentDirectoryForExePathW.assert_called_once_with('test.exe')
+    def test_win_path_needs_curdir(self):
+        with unittest.mock.patch('shutil._winapi.NeedCurrentDirectoryForExePath', return_value=True) as need_curdir_mock:
+            self.assertTrue(shutil._win_path_needs_curdir('dontcare', os.X_OK))
+            need_curdir_mock.assert_called_once_with('dontcare')
+            need_curdir_mock.reset_mock()
+            self.assertFalse(shutil._win_path_needs_curdir('dontcare', 0))
+            need_curdir_mock.assert_not_called()
 
 
 class TestWhichBytes(TestWhich):

diff --git a/Modules/_winapi.c b/Modules/_winapi.c
@@ -2054,6 +2054,26 @@ _winapi__mimetypes_read_windows_registry_impl(PyObject *module,
 #undef CB_TYPE
 }
 
+/*[clinic input]
+_winapi.NeedCurrentDirectoryForExePath -> bool
+
+    exe_name: LPCWSTR
+    /
+[clinic start generated code]*/
+
+static int
+_winapi_NeedCurrentDirectoryForExePath_impl(PyObject *module,
+                                            LPCWSTR exe_name)
+/*[clinic end generated code: output=a65ec879502b58fc input=972aac88a1ec2f00]*/
+{
+    BOOL result;
+
+    Py_BEGIN_ALLOW_THREADS
+    result = NeedCurrentDirectoryForExePathW(exe_name);
+    Py_END_ALLOW_THREADS
+
+    return result;
+}
 
 static PyMethodDef winapi_functions[] = {
     _WINAPI_CLOSEHANDLE_METHODDEF
@@ -2089,6 +2109,7 @@ static PyMethodDef winapi_functions[] = {
     _WINAPI_GETACP_METHODDEF
     _WINAPI_GETFILETYPE_METHODDEF
     _WINAPI__MIMETYPES_READ_WINDOWS_REGISTRY_METHODDEF
+    _WINAPI_NEEDCURRENTDIRECTORYFOREXEPATH_METHODDEF
     {NULL, NULL}
 };
 

diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h