Fix merge bugs

This commit is contained in:
Aaron Gokaslan 2022-02-13 13:16:35 -05:00
parent 9635e884ab
commit dbb3e6bf8a

View File

@ -503,8 +503,9 @@ PYBIND11_NOINLINE std::string error_string(PyObject *type, PyObject *value, PyOb
int lineno = PyFrame_GetLineNumber(frame); int lineno = PyFrame_GetLineNumber(frame);
result += " " + handle(f_code->co_filename).cast<std::string>() + "(" result += " " + handle(f_code->co_filename).cast<std::string>() + "("
+ std::to_string(lineno) + std::to_string(lineno)
+ "): " + handle(frame->f_code->co_name).cast<std::string>() + "\n"; + "): " + handle(f_code->co_name).cast<std::string>() + "\n";
frame = frame->f_back; frame = frame->f_back;
Py_DECREF(f_code);
} }
#endif #endif
} }