Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-22 08:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

detail::obj_class_name(), fprintf with [STDERR], [STDOUT] tags, polish comments

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-05-10 16:38:27 -07:00
parent a8f7a9797e
commit 0691d5f58d
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/pybind11/pytypes.h
View File

@ -365,6 +365,14 @@ T reinterpret_steal(handle h) {
PYBIND11_NAMESPACE_BEGIN(detail) PYBIND11_NAMESPACE_BEGIN(detail)
std::string error_string(); std::string error_string();
std::string error_string(PyObject *, PyObject *, PyObject *); std::string error_string(PyObject *, PyObject *, PyObject *);
inline const char *obj_class_name(PyObject *obj) {
if (Py_TYPE(obj) == &PyType_Type) {
return reinterpret_cast<PyTypeObject *>(obj)->tp_name;
}
return Py_TYPE(obj)->tp_name;
}
PYBIND11_NAMESPACE_END(detail) PYBIND11_NAMESPACE_END(detail)
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -403,14 +411,14 @@ public:
// throw std::runtime_error("Something went wrong."); // throw std::runtime_error("Something went wrong.");
} catch (...) { } catch (...) {
// Terminating the process, to not mask the original error by errors in the error // Terminating the process, to not mask the original error by errors in the error
// handling. Reporting the original error on stderr. Intentionally using the Python // handling. Reporting the original error on stderr & stdout. Intentionally using
// C API directly, to maximize reliability. // the Python C API directly, to maximize reliability.
std::string msg std::string msg
= "FATAL failure building pybind11::error_already_set error_string: "; = "FATAL failure building pybind11::error_already_set error_string: ";
if (m_type.ptr() == nullptr) { if (m_type.ptr() == nullptr) {
msg += "PYTHON_EXCEPTION_TYPE_IS_NULLPTR"; msg += "PYTHON_EXCEPTION_TYPE_IS_NULLPTR";
} else { } else {
const char *tp_name = get_class_name(m_type.ptr()); const char *tp_name = detail::obj_class_name(m_type.ptr());
if (tp_name == nullptr) { if (tp_name == nullptr) {
msg += "PYTHON_EXCEPTION_TP_NAME_IS_NULLPTR"; msg += "PYTHON_EXCEPTION_TP_NAME_IS_NULLPTR";
} else { } else {
@ -431,10 +439,11 @@ public:
+ '"'; + '"';
} }
} }
// Use C calls to reduce include bloat // Intentionally using C calls to maximize reliability (and to avoid #include
fprintf(stderr, "%s\n", msg.c_str()); // <iostream>).
fprintf(stderr, "%s [STDERR]\n", msg.c_str());
fflush(stderr); fflush(stderr);
fprintf(stdout, "%s\n", msg.c_str()); fprintf(stdout, "%s [STDOUT]\n", msg.c_str());
fflush(stdout); fflush(stdout);
std::terminate(); std::terminate();
} }
@ -491,13 +500,6 @@ public:
private: private:
object m_type, m_value, m_trace; object m_type, m_value, m_trace;
mutable std::string m_lazy_what; mutable std::string m_lazy_what;
static const char *get_class_name(PyObject *py) {
if (Py_TYPE(py) == &PyType_Type) {
return reinterpret_cast<PyTypeObject *>(py)->tp_name;
}
return Py_TYPE(py)->tp_name;
}
}; };
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)