Merge pull request #9299 from anntzer/c++-std-runtime_error

tacaswell · web-flow · commit 129403c8cb90 · 2017-10-07T18:30:04.000-04:00
FIX: Restore better error message on std::runtime_error.
diff --git a/src/py_exceptions.h b/src/py_exceptions.h
@@ -46,6 +46,14 @@ class exception : public std::exception
         }                                                                    \
         return (errorcode);                                                  \
     }                                                                        \
+    catch (const std::runtime_error &e)                                      \
+    {                                                                        \
+        PyErr_Format(PyExc_RuntimeError, "In %s: %s", (name), e.what());    \
+        {                                                                    \
+            cleanup;                                                         \
+        }                                                                    \
+        return (errorcode);                                                  \
+    }                                                                        \
     catch (...)                                                              \
     {                                                                        \
         PyErr_Format(PyExc_RuntimeError, "Unknown exception in %s", (name)); \
