fix is_file

youknowone · youknowone · commit 3f8931630775 · 2025-12-28T15:48:38.000+09:00
diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs
@@ -562,15 +562,16 @@ pub(super) mod _os {
 
         #[pymethod]
         fn is_dir(&self, follow_symlinks: FollowSymlinks, vm: &VirtualMachine) -> PyResult<bool> {
+            // Use cached file_type first to avoid stat() calls that may fail
+            if let Ok(file_type) = &self.file_type {
+                if !follow_symlinks.0 || !file_type.is_symlink() {
+                    return Ok(file_type.is_dir());
+                }
+            }
             match super::fs_metadata(&self.pathval, follow_symlinks.0) {
                 Ok(meta) => Ok(meta.is_dir()),
                 Err(e) => {
                     if e.kind() == io::ErrorKind::NotFound {
-                        // On Windows, use cached file_type when file is removed
-                        #[cfg(windows)]
-                        if let Ok(file_type) = &self.file_type {
-                            return Ok(file_type.is_dir());
-                        }
                         Ok(false)
                     } else {
                         Err(e.into_pyexception(vm))
@@ -581,15 +582,16 @@ pub(super) mod _os {
 
         #[pymethod]
         fn is_file(&self, follow_symlinks: FollowSymlinks, vm: &VirtualMachine) -> PyResult<bool> {
+            // Use cached file_type first to avoid stat() calls that may fail
+            if let Ok(file_type) = &self.file_type {
+                if !follow_symlinks.0 || !file_type.is_symlink() {
+                    return Ok(file_type.is_file());
+                }
+            }
             match super::fs_metadata(&self.pathval, follow_symlinks.0) {
                 Ok(meta) => Ok(meta.is_file()),
                 Err(e) => {
                     if e.kind() == io::ErrorKind::NotFound {
-                        // On Windows, use cached file_type when file is removed
-                        #[cfg(windows)]
-                        if let Ok(file_type) = &self.file_type {
-                            return Ok(file_type.is_file());
-                        }
                         Ok(false)
                     } else {
                         Err(e.into_pyexception(vm))
