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

Replaced require_gil with Python::with_gil in test_frompyobject.rs. Removed all unsafe code from macro generated code. Two other small fixes

This commit is contained in:
R2D2 2021-08-02 09:49:13 +02:00
parent 5b8efdd6e2
commit d809e50c9b
2 changed files with 213 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,10 +58,11 @@ impl<'a> Enum<'a> {
let maybe_ret = || -> pyo3::PyResult<Self> {
#struct_derive
}();
match maybe_ret {
ok @ Ok(_) => return ok,
Err(inner) => {
let py = unsafe { Python::assume_gil_acquired() };
let py = pyo3::PyNativeType::py(obj);
err_reasons.push_str(&format!("{}\n", inner.instance(py).str().unwrap()));
}
}
@ -211,7 +212,7 @@ impl<'a> Container<'a> {
);
quote!(
Ok(#self_ty{#ident: obj.extract().map_err(|inner| {
let py = unsafe {Python::assume_gil_acquired() };
let py = pyo3::PyNativeType::py(obj);
let new_err = pyo3::exceptions::PyTypeError::new_err(#error_msg);
new_err.set_cause(py, Some(inner));
new_err
@ -226,7 +227,7 @@ impl<'a> Container<'a> {
};
quote!(
Ok(#self_ty(obj.extract().map_err(|inner| {
let py = unsafe { Python::assume_gil_acquired() };
let py = pyo3::PyNativeType::py(obj);
let err_msg = format!("{}: {}",
#error_msg,
inner.instance(py).str().unwrap());
@ -243,7 +244,7 @@ impl<'a> Container<'a> {
let error_msg = format!("failed to extract field {}.{}", quote!(#self_ty), i);
fields.push(quote!(
s.get_item(#i).extract().map_err(|inner| {
let py = unsafe { Python::assume_gil_acquired() };
let py = pyo3::PyNativeType::py(obj);
let new_err = pyo3::exceptions::PyTypeError::new_err(#error_msg);
new_err.set_cause(py, Some(inner));
new_err
@ -283,14 +284,14 @@ impl<'a> Container<'a> {
let extractor = match &attrs.from_py_with {
None => quote!(
#get_field.extract().map_err(|inner| {
let py = unsafe{ Python::assume_gil_acquired() };
let py = pyo3::PyNativeType::py(obj);
let new_err = pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
new_err.set_cause(py, Some(inner));
new_err
})?),
Some(FromPyWithAttribute(expr_path)) => quote! (
#expr_path(#get_field).map_err(|inner| {
let py = unsafe{ Python::assume_gil_acquired() };
let py = pyo3::PyNativeType::py(obj);
let new_err = pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
new_err.set_cause(py, Some(inner));
new_err

88
tests/test_frompyobject.rs
View File

@ -9,14 +9,12 @@ mod common;
/// Helper function that concatenates the error message from
/// each error in the traceback into a single string that can
/// be tested.
fn extract_traceback(mut error: PyErr) -> String {
let gil = Python::acquire_gil();
let py = gil.python();
fn extract_traceback(py: Python, mut error: PyErr) -> String {
let mut error_msg = error.to_string();
while let Some(err) = error.cause(py) {
while let Some(cause) = error.cause(py) {
error_msg.push_str(": ");
error_msg.push_str(&err.to_string());
error = err;
error_msg.push_str(&cause.to_string());
error = cause
}
error_msg
}
@ -52,8 +50,7 @@ impl PyMappingProtocol for PyA {
#[test]
fn test_named_fields_struct() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let pya = PyA {
s: "foo".into(),
foo: None,
@ -63,6 +60,7 @@ fn test_named_fields_struct() {
assert_eq!(a.s, "foo");
assert_eq!(a.t.to_string_lossy(), "bar");
assert!(a.p.is_none());
});
}
#[derive(Debug, FromPyObject)]
@ -73,14 +71,14 @@ pub struct B {
#[test]
fn test_transparent_named_field_struct() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let test = "test".into_py(py);
let b: B = FromPyObject::extract(test.as_ref(py)).expect("Failed to extract B from String");
assert_eq!(b.test, "test");
let test: PyObject = 1.into_py(py);
let b = B::extract(test.as_ref(py));
assert!(b.is_err())
assert!(b.is_err());
});
}
#[derive(Debug, FromPyObject)]
@ -91,15 +89,16 @@ pub struct D<T> {
#[test]
fn test_generic_transparent_named_field_struct() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let test = "test".into_py(py);
let d: D<String> =
D::extract(test.as_ref(py)).expect("Failed to extract D<String> from String");
assert_eq!(d.test, "test");
let test = 1usize.into_py(py);
let d: D<usize> = D::extract(test.as_ref(py)).expect("Failed to extract D<usize> from String");
let d: D<usize> =
D::extract(test.as_ref(py)).expect("Failed to extract D<usize> from String");
assert_eq!(d.test, 1);
});
}
#[derive(Debug, FromPyObject)]
@ -119,8 +118,7 @@ pub struct PyE {
#[test]
fn test_generic_named_fields_struct() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let pye = PyE {
test: "test".into(),
test2: 2,
@ -133,6 +131,7 @@ fn test_generic_named_fields_struct() {
assert_eq!(e.test2, 2);
let e = E::<usize, usize>::extract(pye.as_ref(py));
assert!(e.is_err());
});
}
#[derive(Debug, FromPyObject)]
@ -143,8 +142,7 @@ pub struct C {
#[test]
fn test_named_field_with_ext_fn() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let pyc = PyE {
test: "foo".into(),
test2: 0,
@ -152,6 +150,7 @@ fn test_named_field_with_ext_fn() {
.into_py(py);
let c = C::extract(pyc.as_ref(py)).expect("Failed to extract C from PyE");
assert_eq!(c.test, "foo");
});
}
#[derive(Debug, FromPyObject)]
@ -159,8 +158,7 @@ pub struct Tuple(String, usize);
#[test]
fn test_tuple_struct() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let tup = PyTuple::new(py, &[1.into_py(py), "test".into_py(py)]);
let tup = Tuple::extract(tup.as_ref());
assert!(tup.is_err());
@ -168,6 +166,7 @@ fn test_tuple_struct() {
let tup = Tuple::extract(tup.as_ref()).expect("Failed to extract Tuple from PyTuple");
assert_eq!(tup.0, "test");
assert_eq!(tup.1, 1);
});
}
#[derive(Debug, FromPyObject)]
@ -175,8 +174,7 @@ pub struct TransparentTuple(String);
#[test]
fn test_transparent_tuple_struct() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let tup: PyObject = 1.into_py(py);
let tup = TransparentTuple::extract(tup.as_ref(py));
assert!(tup.is_err());
@ -184,6 +182,7 @@ fn test_transparent_tuple_struct() {
let tup = TransparentTuple::extract(test.as_ref(py))
.expect("Failed to extract TransparentTuple from PyTuple");
assert_eq!(tup.0, "test");
});
}
#[pyclass]
@ -202,9 +201,7 @@ struct Baz<U, T> {
#[test]
fn test_struct_nested_type_errors() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let pybaz = PyBaz {
tup: ("test".into(), "test".into()),
e: PyE {
@ -217,17 +214,16 @@ fn test_struct_nested_type_errors() {
let test: PyResult<Baz<String, usize>> = FromPyObject::extract(pybaz.as_ref(py));
assert!(test.is_err());
assert_eq!(
extract_traceback(test.unwrap_err()),
extract_traceback(py,test.unwrap_err()),
"TypeError: failed to extract field Baz.tup: TypeError: failed to extract field Tuple.1: \
TypeError: \'str\' object cannot be interpreted as an integer"
);
});
}
#[test]
fn test_struct_nested_type_errors_with_generics() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let pybaz = PyBaz {
tup: ("test".into(), "test".into()),
e: PyE {
@ -240,52 +236,53 @@ fn test_struct_nested_type_errors_with_generics() {
let test: PyResult<Baz<usize, String>> = FromPyObject::extract(pybaz.as_ref(py));
assert!(test.is_err());
assert_eq!(
extract_traceback(test.unwrap_err()),
extract_traceback(py, test.unwrap_err()),
"TypeError: failed to extract field Baz.e: TypeError: failed to extract field E.test: \
TypeError: \'str\' object cannot be interpreted as an integer",
);
});
}
#[test]
fn test_transparent_struct_error_message() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let tup: PyObject = 1.into_py(py);
let tup = B::extract(tup.as_ref(py));
assert!(tup.is_err());
assert_eq!(
extract_traceback(tup.unwrap_err()),
extract_traceback(py,tup.unwrap_err()),
"TypeError: failed to extract field B.test: TypeError: \'int\' object cannot be converted \
to \'PyString\'"
);
});
}
#[test]
fn test_tuple_struct_error_message() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let tup: PyObject = (1, "test").into_py(py);
let tup = Tuple::extract(tup.as_ref(py));
assert!(tup.is_err());
assert_eq!(
extract_traceback(tup.unwrap_err()),
extract_traceback(py, tup.unwrap_err()),
"TypeError: failed to extract field Tuple.0: TypeError: \'int\' object cannot be \
converted to \'PyString\'"
)
);
});
}
#[test]
fn test_transparent_tuple_error_message() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let tup: PyObject = 1.into_py(py);
let tup = TransparentTuple::extract(tup.as_ref(py));
assert!(tup.is_err());
assert_eq!(
extract_traceback(tup.unwrap_err()),
extract_traceback(py, tup.unwrap_err()),
"TypeError: failed to extract inner field of TransparentTuple: 'int' object \
cannot be converted to 'PyString'",
)
);
});
}
#[derive(Debug, FromPyObject)]
@ -324,9 +321,7 @@ pub struct PyBool {
#[test]
fn test_enum() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let tup = PyTuple::new(py, &[1.into_py(py), "test".into_py(py)]);
let f = Foo::extract(tup.as_ref()).expect("Failed to extract Foo from tuple");
match f {
@ -393,6 +388,7 @@ fn test_enum() {
}
_ => panic!("Expected extracting Foo::CatchAll, got {:?}", f),
}
});
}
#[derive(Debug, FromPyObject)]
@ -407,8 +403,7 @@ pub enum Bar {
#[test]
fn test_err_rename() {
let gil = Python::acquire_gil();
let py = gil.python();
Python::with_gil(|py| {
let dict = PyDict::new(py);
let f = Bar::extract(dict.as_ref());
assert!(f.is_err());
@ -419,6 +414,7 @@ fn test_err_rename() {
cannot be interpreted as an integer\n- variant C (int): \'dict\' object cannot be \
interpreted as an integer\n"
);
});
}
#[derive(Debug, FromPyObject)]