Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3392 from deantvv/os-error-str

Browse Source 
Implement __str__ for OSError
This commit is contained in:
Jim Fasarakis-Hilliard
2021-10-31 12:19:23 +02:00
committed by GitHub
parent 859744236e d46f5ba7ab
commit fe1e375a1f
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vm/src/exceptions.rs
View File

@@ -745,6 +745,7 @@ impl ExceptionZoo {
"filename" => ctx.none(),
// second exception filename
"filename2" => ctx.none(),
"__str__" => ctx.new_method("__str__", excs.os_error.clone(), os_error_str),
});
// TODO: this isn't really accurate
#[cfg(windows)]
@@ -859,6 +860,21 @@ fn key_error_str(exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyStrRef {
}
}
fn os_error_str(exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyResult<PyStrRef> {
let args = exc.args();
if args.as_slice().len() == 2 {
// SAFETY: len() == 2 is checked so get_arg 1 or 2 won't panic
let s = format!(
"[Errno {}] {}",
exc.get_arg(0).unwrap().str(vm)?,
exc.get_arg(1).unwrap().str(vm)?
);
Ok(vm.ctx.new_str(s))
} else {
Ok(exc.str(vm))
}
}
fn system_exit_code(exc: PyBaseExceptionRef) -> Option<PyObjectRef> {
exc.args.read().as_slice().first().map(|code| {
match_class!(match code {