Skip to content

Add new_payload_exception helper for constructing built-in payload exceptions #8403

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 9 commits into from
Aug 9, 2026
Merged

Add new_payload_exception helper for constructing built-in payload exceptions #8403

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a22639
Add new_payload_exception helper for built-in payload exceptions
kangdora Jul 27, 2026
82cb35d
Use new_payload_exception for SystemExit raise sites
kangdora Aug 3, 2026
3f9df33
Use new_payload_exception for BlockingIoError raise sites
kangdora Aug 4, 2026
689879b
Use new_payload_exception for OSError errno dispatch in slot_new
kangdora Aug 4, 2026
c373a02
Run rustfmt
kangdora Aug 4, 2026
6e28029
Run clippy
kangdora Aug 4, 2026
abad718
Add type guard to new_payload_exception and extract new_system_exit
kangdora Aug 4, 2026
50e160e
Extract new_system_exit and fix stale expect messages
kangdora Aug 7, 2026
e459e61
Update crates/vm/src/vm/vm_new.rs
youknowone Aug 9, 2026
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
Use new_payload_exception for BlockingIoError raise sites
  • Loading branch information
@kangdora
kangdora committed Aug 4, 2026
commit 3f9df3396c463b1572082fc89397d63a616d3073
27 changes: 14 additions & 13 deletions crates/vm/src/stdlib/_io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ cfg_select! {
}

use crate::{
AsObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, builtins::PyModule,
AsObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
builtins::{PyModule, PyOSError},
};
pub use _io::{OpenArgs, io_open as open};
use rustpython_host_env::io as host_io;
Expand Down Expand Up @@ -943,14 +944,14 @@ mod _io {
Some(n) => n,
None => {
// BlockingIOError(errno, msg, characters_written=0)
return Err(vm.invoke_exception(
vm.ctx.exceptions.blocking_io_error,
return Err(vm.new_payload_exception::<PyOSError>(
vm.ctx.exceptions.blocking_io_error.to_owned(),
vec![
vm.new_pyobj(EAGAIN),
vm.new_pyobj("write could not complete without blocking"),
vm.new_pyobj(0),
],
)?);
].into(),
)?.upcast());
}
};
self.write_pos += n as Offset;
Expand Down Expand Up @@ -1154,14 +1155,14 @@ mod _io {
self.buffer[self.write_end as usize..][..avail].copy_from_slice(&buf[..avail]);
self.write_end += avail as Offset;
self.pos += avail as Offset;
return Err(vm.invoke_exception(
vm.ctx.exceptions.blocking_io_error,
return Err(vm.new_payload_exception::<PyOSError>(
vm.ctx.exceptions.blocking_io_error.to_owned(),
vec![
vm.new_pyobj(EAGAIN),
vm.new_pyobj("write could not complete without blocking"),
vm.new_pyobj(avail),
],
)?);
].into(),
)?.upcast());
}
Err(e) => return Err(e),
}
Expand Down Expand Up @@ -1200,14 +1201,14 @@ mod _io {
self.write_end = buffer_size;
// BlockingIOError(errno, msg, characters_written)
let chars_written = written + buffer_len;
return Err(vm.invoke_exception(
vm.ctx.exceptions.blocking_io_error,
return Err(vm.new_payload_exception::<PyOSError>(
vm.ctx.exceptions.blocking_io_error.to_owned(),
vec![
vm.new_pyobj(EAGAIN),
vm.new_pyobj("write could not complete without blocking"),
vm.new_pyobj(chars_written),
],
)?);
].into(),
)?.upcast());
}
None => break,
}
Expand Down