tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize the exception in py::FetchError

Browse Source 
Reviewers: llugovic, ipaljak

Reviewed By: llugovic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2668
This commit is contained in:
Teon Banek 2020-02-12 14:40:13 +01:00
parent beec3e3f5f
commit 6a7b983a58
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/py/py.hpp
View File

@ -150,8 +150,9 @@ inline std::ostream &operator<<(std::ostream &os,
Object format_exception_fn(
PyObject_GetAttrString(traceback_mod, "format_exception"));
CHECK(format_exception_fn);
auto list = format_exception_fn.Call(exc_info.type, exc_info.value,
exc_info.traceback);
auto list = format_exception_fn.Call(
exc_info.type, exc_info.value ? exc_info.value : Py_None,
exc_info.traceback ? exc_info.traceback : Py_None);
CHECK(list);
auto len = PyList_GET_SIZE(static_cast<PyObject *>(list));
for (Py_ssize_t i = 0; i < len; ++i) {
@ -168,6 +169,7 @@ inline std::optional<ExceptionInfo> FetchError() {
PyObject *exc_type, *exc_value, *traceback;
PyErr_Fetch(&exc_type, &exc_value, &traceback);
if (!exc_type) return std::nullopt;
PyErr_NormalizeException(&exc_type, &exc_value, &traceback);
return ExceptionInfo{Object(exc_type), Object(exc_value), Object(traceback)};
}