fix remove

Author: youknowone

Lib/test/test_os.py

@@ -736,7 +736,6 @@ def test_file_attributes(self):
             result.st_file_attributes & stat.FILE_ATTRIBUTE_DIRECTORY,
             stat.FILE_ATTRIBUTE_DIRECTORY)
 
-    @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON; os.stat (PermissionError: [Errno 5] Access is denied.)')
     @unittest.skipUnless(sys.platform == "win32", "Win32 specific tests")
     def test_access_denied(self):
         # Default to FindFirstFile WIN32_FIND_DATA when access is
@@ -759,7 +758,6 @@ def test_access_denied(self):
         self.assertNotEqual(result.st_size, 0)
         self.assertTrue(os.path.isfile(fname))
 
-    @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON; os.stat (PermissionError: [Errno 1] Incorrect function.)')
     @unittest.skipUnless(sys.platform == "win32", "Win32 specific tests")
     def test_stat_block_device(self):
         # bpo-38030: os.stat fails for block devices
@@ -1796,7 +1794,6 @@ def test_mode(self):
                 self.assertEqual(os.stat(path).st_mode & 0o777, 0o555)
                 self.assertEqual(os.stat(parent).st_mode & 0o777, 0o775)
 
-    @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON; os.umask not implemented yet for all platforms')
     @unittest.skipIf(
         support.is_emscripten or support.is_wasi,
         "Emscripten's/WASI's umask is a stub."
@@ -2116,7 +2113,6 @@ def test_urandom_fd_closed(self):
             """
         rc, out, err = assert_python_ok('-Sc', code)
 
-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; (ModuleNotFoundError: No module named 'os'")
     def test_urandom_fd_reopened(self):
         # Issue #21207: urandom() should detect its fd to /dev/urandom
         # changed to something else, and reopen it.
@@ -3221,7 +3217,6 @@ def test_getfinalpathname_handles(self):
 
         self.assertEqual(0, handle_delta)
 
-    @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON; os.stat (PermissionError: [Errno 5] Access is denied.)')
     @support.requires_subprocess()
     def test_stat_unlink_race(self):
         # bpo-46785: the implementation of os.stat() falls back to reading
@@ -4927,7 +4922,6 @@ def setUp(self):
         self.addCleanup(os_helper.rmtree, self.path)
         os.mkdir(self.path)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON; (AssertionError: TypeError not raised by DirEntry)
     def test_uninstantiable(self):
         self.assertRaises(TypeError, os.DirEntry)
 
@@ -4976,7 +4970,6 @@ def assert_stat_equal(self, stat1, stat2, skip_fields):
         else:
             self.assertEqual(stat1, stat2)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON; (AssertionError: TypeError not raised by ScandirIter)
     def test_uninstantiable(self):
         scandir_iter = os.scandir(self.path)
         self.assertRaises(TypeError, type(scandir_iter))
@@ -5230,7 +5223,6 @@ def test_fd(self):
                     st = os.stat(entry.name, dir_fd=fd, follow_symlinks=False)
                     self.assertEqual(entry.stat(follow_symlinks=False), st)
 
-    @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON; (AssertionError: FileNotFoundError not raised by scandir)')
     @unittest.skipIf(support.is_wasi, "WASI maps '' to cwd")
     def test_empty_path(self):
         self.assertRaises(FileNotFoundError, os.scandir, '')

Lib/test/test_shutil.py

@@ -235,7 +235,6 @@ def onexc(*args):
         self.assertEqual(errors[0][1], link)
         self.assertIsInstance(errors[0][2], OSError)
 
-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
     @os_helper.skip_unless_symlink
     def test_rmtree_works_on_symlinks(self):
         tmp = self.mkdtemp()

crates/vm/src/stdlib/os.rs

@@ -152,6 +152,8 @@ impl ToPyObject for crt_fd::Borrowed<'_> {
 #[pymodule(sub)]
 pub(super) mod _os {
     use super::{DirFd, FollowSymlinks, SupportFunc, errno_err};
+    #[cfg(windows)]
+    use crate::common::windows::ToWideString;
     use crate::{
         AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject,
         builtins::{
@@ -292,10 +294,29 @@ pub(super) mod _os {
     #[pyfunction(name = "unlink")]
     fn remove(path: OsPath, dir_fd: DirFd<'_, 0>, vm: &VirtualMachine) -> PyResult<()> {
         let [] = dir_fd.0;
-        let is_junction = cfg!(windows)
-            && fs::metadata(&path).is_ok_and(|meta| meta.file_type().is_dir())
-            && fs::symlink_metadata(&path).is_ok_and(|meta| meta.file_type().is_symlink());
-        let res = if is_junction {
+        #[cfg(windows)]
+        let is_dir_link = {
+            // On Windows, we need to check if it's a directory symlink/junction
+            // using GetFileAttributesW, which doesn't follow symlinks.
+            // This is similar to CPython's Py_DeleteFileW.
+            use windows_sys::Win32::Storage::FileSystem::{
+                FILE_ATTRIBUTE_DIRECTORY, FILE_ATTRIBUTE_REPARSE_POINT, GetFileAttributesW,
+                INVALID_FILE_ATTRIBUTES,
+            };
+            let wide_path: Vec<u16> = path.path.as_os_str().to_wide_with_nul();
+            let attrs = unsafe { GetFileAttributesW(wide_path.as_ptr()) };
+            if attrs != INVALID_FILE_ATTRIBUTES {
+                let is_dir = (attrs & FILE_ATTRIBUTE_DIRECTORY) != 0;
+                let is_reparse = (attrs & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
+                is_dir && is_reparse
+            } else {
+                false
+            }
+        };
+        #[cfg(not(windows))]
+        let is_dir_link = false;
+
+        let res = if is_dir_link {
             fs::remove_dir(&path)
         } else {
             fs::remove_file(&path)

crates/vm/src/stdlib/sys.rs

@@ -12,7 +12,6 @@ mod sys {
         common::{
             ascii,
             hash::{PyHash, PyUHash},
-            windows::ToWideString,
         },
         convert::ToPyObject,
         frame::FrameRef,
@@ -550,6 +549,7 @@ mod sys {
 
     #[cfg(windows)]
     fn get_kernel32_version() -> std::io::Result<(u32, u32, u32)> {
+        use crate::common::windows::ToWideString;
         unsafe {
             // Create a wide string for "kernel32.dll"
             let module_name: Vec<u16> = std::ffi::OsStr::new("kernel32.dll").to_wide_with_nul();