os.remove can remove junctions on windows

coolreader18 · coolreader18 · commit e4b93280ca88 · 2020-11-02T20:22:10.000-06:00
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -372,6 +372,7 @@ def _waitfor(func, pathname, waitall=False):
             # Increase the timeout and try again
             time.sleep(timeout)
             timeout *= 2
+        print("ooh there's still", L)
         warnings.warn('tests may fail, delete still pending for ' + pathname,
                       RuntimeWarning, stacklevel=4)
 
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -437,7 +437,17 @@ mod _os {
     #[pyfunction]
     fn remove(path: PyPathLike, dir_fd: DirFd, vm: &VirtualMachine) -> PyResult<()> {
         let path = make_path(vm, &path, &dir_fd)?;
-        fs::remove_file(path).map_err(|err| err.into_pyexception(vm))
+        let is_junction = cfg!(windows)
+            && fs::metadata(path).map_or(false, |meta| {
+                let ty = meta.file_type();
+                ty.is_dir() && ty.is_symlink()
+            });
+        let res = if is_junction {
+            fs::remove_dir(path)
+        } else {
+            fs::remove_file(path)
+        };
+        res.map_err(|err| err.into_pyexception(vm))
     }
 
     #[pyfunction]
