exception handler tweaks (fixes #284)

6969e7c1 · Wenzel Jakob · d46b6eee · 6969e7c1
Commit 6969e7c1 authored Jul 18, 2016 by Wenzel Jakob
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

include/pybind11/cast.h include/pybind11/cast.h +8 -8

No files found.
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -104,18 +104,18 @@ PYBIND11_NOINLINE inline handle get_type_handle(const std::type_info &tp) {
 }
 PYBIND11_NOINLINE inline std::string error_string() {
-    std::string errorString;
+   PyObject *type, *value, *traceback;
-    PyThreadState *tstate = PyThreadState_GET();
+   PyErr_Fetch(&type, &value, &traceback);
-    if (tstate == nullptr)
-        return "";
-    if (tstate->curexc_type) {
+   std::string errorString;
-        errorString += (std::string) handle(tstate->curexc_type).str();
+    if (type) {
+        errorString += (std::string) handle(type).str();
        errorString += ": ";
    }
-    if (tstate->curexc_value)
+    if (value)
-        errorString += (std::string) handle(tstate->curexc_value).str();
+        errorString += (std::string) handle(value).str();
+    PyErr_Restore(type, value, traceback);
    return errorString;
 }