Skip to content

WindowsError #6333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 1 commit into from
Dec 6, 2025
Merged

WindowsError #6333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Lib/test/test_exception_hierarchy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ def test_posix_error(self):
if os.name == "nt":
self.assertEqual(e.winerror, None)

# TODO: RUSTPYTHON
@unittest.expectedFailure
@unittest.skipUnless(os.name == "nt", "Windows-specific test")
def test_errno_translation(self):
# ERROR_ALREADY_EXISTS (183) -> EEXIST
Expand Down
26 changes: 22 additions & 4 deletions crates/vm/src/exceptions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,6 +1501,14 @@ pub(super) mod types {
#[cfg(windows)]
if let Some(winerror) = new_args.args.get(3) {
zelf.set_attr("winerror", winerror.clone(), vm)?;
// Convert winerror to errno and replace args[0] (CPython behavior)
if let Some(winerror_int) = winerror
.downcast_ref::<crate::builtins::PyInt>()
.and_then(|w| w.try_to_primitive::<i32>(vm).ok())
{
let errno = crate::common::os::winerror_to_errno(winerror_int);
new_args.args[0] = vm.new_pyobj(errno);
}
}
if let Some(filename2) = new_args.args.get(4) {
zelf.set_attr("filename2", filename2.clone(), vm)?;
Expand All @@ -1521,19 +1529,29 @@ pub(super) mod types {
let errno = exc.get_arg(0).unwrap().str(vm)?;
let msg = exc.get_arg(1).unwrap().str(vm)?;

// On Windows, use [WinError X] format when winerror is set
#[cfg(windows)]
let (label, code) = match obj.get_attr("winerror", vm) {
Ok(winerror) if !vm.is_none(&winerror) => ("WinError", winerror.str(vm)?),
_ => ("Errno", errno.clone()),
};
#[cfg(not(windows))]
let (label, code) = ("Errno", errno.clone());

let s = match obj.get_attr("filename", vm) {
Ok(filename) if !vm.is_none(&filename) => match obj.get_attr("filename2", vm) {
Ok(filename2) if !vm.is_none(&filename2) => format!(
"[Errno {}] {}: '{}' -> '{}'",
errno,
"[{} {}] {}: '{}' -> '{}'",
label,
code,
msg,
filename.str(vm)?,
filename2.str(vm)?
),
_ => format!("[Errno {}] {}: '{}'", errno, msg, filename.str(vm)?),
_ => format!("[{} {}] {}: '{}'", label, code, msg, filename.str(vm)?),
},
_ => {
format!("[Errno {errno}] {msg}")
format!("[{label} {code}] {msg}")
}
};
vm.ctx.new_str(s)
Expand Down
6 changes: 6 additions & 0 deletions crates/vm/src/stdlib/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,4 +1187,10 @@ pub fn init_module(vm: &VirtualMachine, module: &Py<PyModule>) {
extend_module!(vm, module, {
"JitError" => ctx.exceptions.jit_error.to_owned(),
});

#[cfg(windows)]
extend_module!(vm, module, {
// OSError alias for Windows
"WindowsError" => ctx.exceptions.os_error.to_owned(),
});
}
Loading