luxolus/pyo3
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1171 from davidhewitt/fix-new-err

Browse source 
Fix build for new apis
This commit is contained in:
David Hewitt 2020-09-10 21:59:25 +01:00 committed by GitHub
parent 151af7a0b7 c519b4de76
commit 1489ca2e8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/types/function.rs
View file

@ -42,9 +42,10 @@ impl PyCFunction {
) -> PyResult<&'a PyCFunction> { ) -> PyResult<&'a PyCFunction> {
let (py, module) = py_or_module.into_py_and_maybe_module(); let (py, module) = py_or_module.into_py_and_maybe_module();
let doc: &'static CStr = CStr::from_bytes_with_nul(doc.as_bytes()) let doc: &'static CStr = CStr::from_bytes_with_nul(doc.as_bytes())
.map_err(|_| PyValueError::py_err("docstring must end with NULL byte."))?; .map_err(|_| PyValueError::new_err("docstring must end with NULL byte."))?;
let name = CString::new(name.as_bytes()) let name = CString::new(name.as_bytes()).map_err(|_| {
.map_err(|_| PyValueError::py_err("Function name cannot contain contain NULL byte."))?; PyValueError::new_err("Function name cannot contain contain NULL byte.")
})?;
let def = match fun { let def = match fun {
PyMethodType::PyCFunction(fun) => ffi::PyMethodDef { PyMethodType::PyCFunction(fun) => ffi::PyMethodDef {
ml_name: name.into_raw() as _, ml_name: name.into_raw() as _,
@ -59,7 +60,7 @@ impl PyCFunction {
ml_doc: doc.as_ptr() as _, ml_doc: doc.as_ptr() as _,
}, },
_ => { _ => {
return Err(PyValueError::py_err( return Err(PyValueError::new_err(
"Only PyCFunction and PyCFunctionWithKeywords are valid.", "Only PyCFunction and PyCFunctionWithKeywords are valid.",
)) ))
} }