mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Fix ci errors

Browse Source
This commit is contained in:
Noah
2020-05-04 11:43:17 -05:00
parent 466f24ceb9
commit b75ba3e19e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vm/src/import.rs
View File

@@ -45,7 +45,7 @@ pub fn init_importlib(vm: &VirtualMachine, initialize_parameter: InitParameter)
path_hooks.insert(0, zipimporter);
Ok(())
})();
if let Err(_) = zipimport_res {
if zipimport_res.is_err() {
eprintln!("couldn't init zipimport")
}
}

6
vm/src/stdlib/io.rs
View File

@@ -620,14 +620,14 @@ mod fileio {
vm,
)?
};
(name.clone().into_object(), fd)
(name.into_object(), fd)
}
Either::B(fno) => (vm.new_int(fno), fno),
};
vm.set_attr(&file_io, "name", name)?;
vm.set_attr(&file_io, "__fileno", vm.new_int(file_no))?;
vm.set_attr(&file_io, "__closefd", vm.new_bool(args.closefd))?;
vm.set_attr(&file_io, "closefd", vm.new_bool(args.closefd))?;
vm.set_attr(&file_io, "__closed", vm.new_bool(false))?;
Ok(vm.get_none())
}
@@ -723,7 +723,7 @@ mod fileio {
}
fn file_io_close(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
let closefd = objbool::boolval(vm, vm.get_attribute(instance.clone(), "__closefd")?)?;
let closefd = objbool::boolval(vm, vm.get_attribute(instance.clone(), "closefd")?)?;
if closefd {
let raw_handle =
i64::try_from_object(vm, vm.get_attribute(instance.clone(), "__fileno")?)?;