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

Normalize the exception only locally in error_string(). Python 3.6 & 3.7 test failures expected. This is meant for benchmarking, to determine if it is worth the trouble looking into the failures.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-05-12 01:30:20 -07:00
parent b020e04275
commit 02df6c0114
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/pybind11/detail/type_caster_base.h
View File

@ -477,16 +477,22 @@ error_string(PyObject *exc_type, PyObject *exc_value, PyObject *exc_trace) {
"Internal error: pybind11::detail::error_string() called with exc_type == nullptr"); "Internal error: pybind11::detail::error_string() called with exc_type == nullptr");
} }
auto result = handle(exc_type).attr("__name__").cast<std::string>(); // Normalize the exception only locally (to avoid side-effects for our caller).
object exc_type_loc = reinterpret_borrow<object>(exc_type);
object exc_value_loc = reinterpret_borrow<object>(exc_value);
object exc_trace_loc = reinterpret_borrow<object>(exc_trace);
PyErr_NormalizeException(&exc_type_loc.ptr(), &exc_value_loc.ptr(), &exc_trace_loc.ptr());
auto result = exc_type_loc.attr("__name__").cast<std::string>();
result += ": "; result += ": ";
if (exc_value) { if (exc_value_loc) {
result += (std::string) str(exc_value); result += (std::string) str(exc_value_loc);
} }
if (exc_trace) { if (exc_trace_loc) {
#if !defined(PYPY_VERSION) #if !defined(PYPY_VERSION)
auto *tb = reinterpret_cast<PyTracebackObject *>(exc_trace); auto *tb = reinterpret_cast<PyTracebackObject *>(exc_trace_loc.ptr());
// Get the deepest trace possible. // Get the deepest trace possible.
while (tb->tb_next) { while (tb->tb_next) {
@ -529,7 +535,6 @@ error_string(PyObject *exc_type, PyObject *exc_value, PyObject *exc_trace) {
PYBIND11_NOINLINE std::string error_string() { PYBIND11_NOINLINE std::string error_string() {
error_scope scope; // Fetch error state. error_scope scope; // Fetch error state.
PyErr_NormalizeException(&scope.type, &scope.value, &scope.trace);
return error_string(scope.type, scope.value, scope.trace); return error_string(scope.type, scope.value, scope.trace);
} }

1
include/pybind11/pytypes.h
View File

@ -395,7 +395,6 @@ public:
"Python error indicator not set."); "Python error indicator not set.");
} }
PyErr_Fetch(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr()); PyErr_Fetch(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
} }
error_already_set(const error_already_set &) = default; error_already_set(const error_already_set &) = default;