Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-11 08:03:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 059362bcab into 1f8b4a7f1a

Browse Source
This commit is contained in:
Ed Catmur 2024-09-20 23:44:04 -07:00 committed by GitHub
commit f49957bfae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/pybind11/pytypes.h
View File

@ -716,6 +716,8 @@ struct error_fetch_and_normalize {
return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0); return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0);
} }
std::nested_exception get_cause_as_nested() const;
// Not protecting these for simplicity. // Not protecting these for simplicity.
object m_type, m_value, m_trace; object m_type, m_value, m_trace;
@ -736,13 +738,17 @@ PYBIND11_NAMESPACE_END(detail)
/// thrown to propagate python-side errors back through C++ which can either be caught manually or /// thrown to propagate python-side errors back through C++ which can either be caught manually or
/// else falls back to the function dispatcher (which then raises the captured error back to /// else falls back to the function dispatcher (which then raises the captured error back to
/// python). /// python).
class PYBIND11_EXPORT_EXCEPTION error_already_set : public std::exception { class PYBIND11_EXPORT_EXCEPTION error_already_set : public std::exception,
public std::nested_exception {
public: public:
/// Fetches the current Python exception (using PyErr_Fetch()), which will clear the /// Fetches the current Python exception (using PyErr_Fetch()), which will clear the
/// current Python error indicator. /// current Python error indicator.
error_already_set() error_already_set()
: m_fetched_error{new detail::error_fetch_and_normalize("pybind11::error_already_set"), : m_fetched_error{new detail::error_fetch_and_normalize("pybind11::error_already_set"),
m_fetched_error_deleter} {} m_fetched_error_deleter} {
if (not nested_ptr())
static_cast<std::nested_exception &>(*this) = m_fetched_error->get_cause_as_nested();
}
/// The what() result is built lazily on demand. /// The what() result is built lazily on demand.
/// WARNING: This member function needs to acquire the Python GIL. This can lead to /// WARNING: This member function needs to acquire the Python GIL. This can lead to
@ -2550,6 +2556,20 @@ bool object_api<D>::rich_compare(object_api const &other, int value) const {
return rv == 1; return rv == 1;
} }
inline std::nested_exception error_fetch_and_normalize::get_cause_as_nested() const {
auto cause = reinterpret_steal<object>(PyException_GetCause(m_value.ptr()));
if (not cause or cause.is_none())
return std::nested_exception();
auto typ = type::of(cause);
auto tb = reinterpret_steal<object>(PyException_GetTraceback(cause.ptr()));
PyErr_Restore(typ.release().ptr(), cause.release().ptr(), tb.release().ptr());
try {
throw error_already_set();
} catch (...) {
return std::nested_exception();
}
}
#define PYBIND11_MATH_OPERATOR_UNARY(op, fn) \ #define PYBIND11_MATH_OPERATOR_UNARY(op, fn) \
template <typename D> \ template <typename D> \
object object_api<D>::op() const { \ object object_api<D>::op() const { \