RustPython
diff --git a/‎vm/src/stdlib/io.rs
Lines changed: 7 additions & 5 deletions b/‎vm/src/stdlib/io.rs
Lines changed: 7 additions & 5 deletions
diff --git a/‎vm/src/stdlib/mod.rs
Lines changed: 17 additions & 9 deletions b/‎vm/src/stdlib/mod.rs
Lines changed: 17 additions & 9 deletions
diff --git a/‎vm/src/stdlib/msvcrt.rs
Lines changed: 1 addition & 1 deletion b/‎vm/src/stdlib/msvcrt.rs
Lines changed: 1 addition & 1 deletion
@@ -9,8 +9,6 @@ cfg_if::cfg_if! {
     }
 }
 
-#[cfg(unix)]
-use crate::stdlib::os::{errno_err, PathOrFd};
 use crate::{PyObjectRef, PyResult, TryFromObject, VirtualMachine};
 pub(crate) use _io::io_open as open;
 
@@ -89,7 +87,7 @@ mod _io {
         PyThreadMutex, PyThreadMutexGuard,
     };
     use crate::common::rc::PyRc;
-    use crate::exceptions::{self, IntoPyException, PyBaseExceptionRef};
+    use crate::exceptions::{self, PyBaseExceptionRef};
     use crate::function::{ArgIterable, FuncArgs, OptionalArg, OptionalOption};
     use crate::slots::SlotConstructor;
     use crate::utils::Either;
@@ -159,6 +157,7 @@ mod _io {
     fn os_err(vm: &VirtualMachine, err: io::Error) -> PyBaseExceptionRef {
         #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
         {
+            use crate::exceptions::IntoPyException;
             err.into_pyexception(vm)
         }
         #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
@@ -3530,8 +3529,11 @@ mod _io {
 
         // check file descriptor validity
         #[cfg(unix)]
-        if let Ok(PathOrFd::Fd(fd)) = PathOrFd::try_from_object(vm, file.clone()) {
-            nix::fcntl::fcntl(fd, nix::fcntl::F_GETFD).map_err(|_| errno_err(vm))?;
+        if let Ok(crate::stdlib::os::PathOrFd::Fd(fd)) =
+            TryFromObject::try_from_object(vm, file.clone())
+        {
+            nix::fcntl::fcntl(fd, nix::fcntl::F_GETFD)
+                .map_err(|_| crate::stdlib::os::errno_err(vm))?;
         }
 
         // Construct a FileIO (subclass of RawIOBase)
 
@@ -1,8 +1,3 @@
-use crate::vm::VirtualMachine;
-use crate::PyObjectRef;
-use std::borrow::Cow;
-use std::collections::HashMap;
-
 mod array;
 #[cfg(feature = "rustpython-ast")]
 pub(crate) mod ast;
@@ -52,6 +47,16 @@ mod zlib;
 #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
 #[macro_use]
 pub(crate) mod os;
+#[cfg(windows)]
+pub(crate) mod nt;
+#[cfg(unix)]
+pub(crate) mod posix;
+#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
+#[cfg(not(any(unix, windows)))]
+pub(crate) mod posix_compat;
+#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
+#[cfg(not(any(unix, windows)))]
+pub(crate) use posix_compat as posix;
 
 #[cfg(not(target_arch = "wasm32"))]
 mod faulthandler;
@@ -83,6 +88,11 @@ mod winapi;
 #[cfg(windows)]
 mod winreg;
 
+use crate::vm::VirtualMachine;
+use crate::PyObjectRef;
+use std::borrow::Cow;
+use std::collections::HashMap;
+
 pub type StdlibInitFunc = Box<py_dyn_fn!(dyn Fn(&VirtualMachine) -> PyObjectRef)>;
 
 pub type StdlibMap = HashMap<Cow<'static, str>, StdlibInitFunc, ahash::RandomState>;
@@ -152,12 +162,9 @@ pub fn get_module_inits() -> StdlibMap {
         {
             "symtable" => symtable::make_module,
         }
-        #[cfg(any(unix, windows, target_os = "wasi"))]
-        {
-            os::MODULE_NAME => os::make_module,
-        }
         #[cfg(any(unix, target_os = "wasi"))]
         {
+            "posix" => posix::make_module,
             "fcntl" => fcntl::make_module,
         }
         // disable some modules on WASM
@@ -195,6 +202,7 @@ pub fn get_module_inits() -> StdlibMap {
         // Windows-only
         #[cfg(windows)]
         {
+            "nt" => nt::make_module,
             "msvcrt" => msvcrt::make_module,
             "_winapi" => winapi::make_module,
             "winreg" => winreg::make_module,
 
@@ -1,7 +1,7 @@
 use super::os::errno_err;
 use crate::{
     builtins::{PyBytes, PyStrRef},
-    PyObjectRef, PyRef, PyResult, VirtualMachine,
+    suppress_iph, PyObjectRef, PyRef, PyResult, VirtualMachine,
 };
 use itertools::Itertools;
 use winapi::{