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

Merge #3141

Browse source 
3141: Add BaseExceptionGroup for Python >= 3.11 r=adamreichold a=adriangb

Not sure if this is totally off base, but it looks like it may be this easy to add support for ExceptionGroup?

Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-05-08 08:39:21 +00:00 committed by GitHub
parent 1cdac4fde4 16d333f9d0
commit 8ab3f5fc47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
newsfragments/3141.added.md Normal file
View file

@ -0,0 +1 @@
Add FFI definition for `BaseExceptionGroup`, which was added in Python 3.11 by [PEP 0654](https://peps.python.org/pep-0654/).

2
pyo3-ffi/src/pyerrors.rs
View file

@ -103,6 +103,8 @@ pub unsafe fn PyUnicodeDecodeError_Create(
extern "C" { extern "C" {
#[cfg_attr(PyPy, link_name = "PyPyExc_BaseException")] #[cfg_attr(PyPy, link_name = "PyPyExc_BaseException")]
pub static mut PyExc_BaseException: *mut PyObject; pub static mut PyExc_BaseException: *mut PyObject;
#[cfg(Py_3_11)]
pub static mut PyExc_BaseExceptionGroup: *mut PyObject;
#[cfg_attr(PyPy, link_name = "PyPyExc_Exception")] #[cfg_attr(PyPy, link_name = "PyPyExc_Exception")]
pub static mut PyExc_Exception: *mut PyObject; pub static mut PyExc_Exception: *mut PyObject;
#[cfg_attr(PyPy, link_name = "PyPyExc_StopAsyncIteration")] #[cfg_attr(PyPy, link_name = "PyPyExc_StopAsyncIteration")]

13
src/exceptions.rs
View file

@ -493,7 +493,7 @@ impl_native_exception!(
PyExc_UnicodeError, PyExc_UnicodeError,
native_doc!("UnicodeError") native_doc!("UnicodeError")
); );
// these three errors need arguments, so they're too annoying to write tests for using macros... // these four errors need arguments, so they're too annoying to write tests for using macros...
impl_native_exception!( impl_native_exception!(
PyUnicodeDecodeError, PyUnicodeDecodeError,
PyExc_UnicodeDecodeError, PyExc_UnicodeDecodeError,
@ -509,6 +509,12 @@ impl_native_exception!(
PyExc_UnicodeTranslateError, PyExc_UnicodeTranslateError,
native_doc!("UnicodeTranslateError", "") native_doc!("UnicodeTranslateError", "")
); );
#[cfg(Py_3_11)]
impl_native_exception!(
PyBaseExceptionGroup,
PyExc_BaseExceptionGroup,
native_doc!("BaseExceptionGroup", "")
);
impl_native_exception!(PyValueError, PyExc_ValueError, native_doc!("ValueError")); impl_native_exception!(PyValueError, PyExc_ValueError, native_doc!("ValueError"));
impl_native_exception!( impl_native_exception!(
PyZeroDivisionError, PyZeroDivisionError,
@ -1028,7 +1034,10 @@ mod tests {
); );
}); });
} }
#[cfg(Py_3_11)]
test_exception!(PyBaseExceptionGroup, |_| {
PyBaseExceptionGroup::new_err(("msg", vec![PyValueError::new_err("err")]))
});
test_exception!(PyBaseException); test_exception!(PyBaseException);
test_exception!(PyException); test_exception!(PyException);
test_exception!(PyStopAsyncIteration); test_exception!(PyStopAsyncIteration);