Handle files correctly

python · zooba · Feb 8, 2023 · Jan 25, 2023 · Jan 25, 2023 · Jan 25, 2023
commit 565c2e1583d34a943bbc97ba4edcd04a3dc32aca
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
@@ -890,6 +890,11 @@ def test_isjunction(self):
                 self.assertFalse(ntpath.isjunction('tmpdir'))
                 self.assertPathEqual(ntpath.realpath('testjunc'), ntpath.realpath('tmpdir'))
 
+    @unittest.skipIf(sys.platform != 'win32', "drive letters are a windows concept")
+    def test_isfile_driveletter(self):
+        current_drive = os.path.splitdrive(os.path.abspath(__file__))[0] + "\\"
+        self.assertFalse(os.path.isfile(current_drive))
+
     @unittest.skipIf(sys.platform != 'win32', "Fast paths are only for win32")
     @cpython_only
     def test_fast_paths_in_use(self):

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -15065,13 +15065,10 @@ os__isfile_impl(PyObject *module, PyObject *path)
                             OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
     }
     if (hfile != INVALID_HANDLE_VALUE) {
-        GetFileInformationByHandleEx(hfile, FileBasicInfo, &info, sizeof(info));
-        result = !(info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-        if (result) {
-            fileType = GetFileType(hfile);
-            if (fileType != FILE_TYPE_DISK) {
-                result = 0;
-            }
+        if (GetFileInformationByHandleEx(hfile, FileBasicInfo, &info, sizeof(info))) {
+            result = !(info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY);
+        } else {
+            result = 0;
         }
         if (close_file) {
             CloseHandle(hfile);