Skip to content

Integrate OSError creations into OSErrorBuilder #6443

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 5 commits into from
Dec 16, 2025
Merged

Integrate OSError creations into OSErrorBuilder #6443

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b35e1a8
{IO=>OS}ErrorBuilder
youknowone Dec 15, 2025
d7357f8
Integrate OSError creations into OSErrorBuilder
youknowone Dec 15, 2025
51b6347
fix macos
youknowone Dec 16, 2025
6fbd7b5
apply review
youknowone Dec 16, 2025
ccc153e
try review suggestion
youknowone Dec 16, 2025
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
Prev Previous commit
Next Next commit
fix macos
  • Loading branch information
@youknowone
youknowone committed Dec 16, 2025
commit 51b634738aab81bfd2ee26adc888028d826e8cd5
28 changes: 16 additions & 12 deletions crates/vm/src/exceptions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,18 +1292,22 @@ pub(super) mod types {
filename2,
} = self;

#[cfg(windows)]
let winerror = winerror.to_pyobject(vm);
#[cfg(not(windows))]
let winerror = vm.ctx.none();

let args = vec![
errno.to_pyobject(vm),
strerror.to_pyobject(vm),
filename.to_pyobject(vm),
winerror,
filename2.to_pyobject(vm),
];
let args = if let Some(errno) = errno {
#[cfg(windows)]
let winerror = winerror.to_pyobject(vm);
#[cfg(not(windows))]
let winerror = vm.ctx.none();

vec![
errno.to_pyobject(vm),
strerror.to_pyobject(vm),
filename.to_pyobject(vm),
winerror,
filename2.to_pyobject(vm),
]
} else {
vec![strerror.to_pyobject(vm)]
};

let payload = PyOSError::py_new(&exc_type, args.clone().into(), vm)
.expect("new_os_error usage error");
Expand Down
Loading