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

Added support for enhanced errors for the FromPyObject trait derived on tuples and newtype structs/tuples

This commit is contained in:
R2D2 2021-05-28 00:38:32 +02:00
parent 8981b84b79
commit 1843ff20fd
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pyo3-macros-backend/src/from_pyobject.rs
View File

@ -200,10 +200,21 @@ impl<'a> Container<'a> {
let self_ty = &self.path;
if let Some(ident) = field_ident {
quote!(
Ok(#self_ty{#ident: obj.extract()?})
Ok(#self_ty{#ident: obj.extract().map_err(|inner| {
let err_msg = format!("failed to extract field {}.{}\n\nCaused by:\n {}\n",
stringify!(#self_ty),
stringify!(#ident),
inner);
pyo3::exceptions::PyTypeError::new_err(err_msg)
})?})
)
} else {
quote!(Ok(#self_ty(obj.extract()?)))
quote!(Ok(#self_ty(obj.extract().map_err(|inner| {
let err_msg = format!("failed to extract inner field of {}\n\nCaused by:\n {}\n",
stringify!(#self_ty),
inner);
pyo3::exceptions::PyTypeError::new_err(err_msg)
})?)))
}
}
@ -211,7 +222,13 @@ impl<'a> Container<'a> {
let self_ty = &self.path;
let mut fields: Punctuated<TokenStream, syn::Token![,]> = Punctuated::new();
for i in 0..len {
fields.push(quote!(s.get_item(#i).extract()?));
fields.push(quote!(s.get_item(#i).extract().map_err(|inner| {
let err_msg = format!("failed to extract field {}.{}\n\nCaused by:\n {}\n",
stringify!(#self_ty),
#i,
inner);
pyo3::exceptions::PyTypeError::new_err(err_msg)
})?));
}
let msg = if self.is_enum_variant {
quote!(format!(