Skip to content

[cpyrt] Accept a Python string from the pretty printer in op_str #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronj0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[cpyrt] Accept a Python string from the pretty printer in op_str #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/cpyrt/CPPInstance.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,9 +899,20 @@ static PyObject* op_str(CPPInstance* self) {

PyObject* result = nullptr;
if (pretty) {
const std::string& pv =
*(std::string*)((CPPInstance*)pretty)->GetObject();
if (!pv.empty() && pv.find("@0x") == std::string::npos)
// the std::string executor may return a Python string
std::string pv;
if (cpyrt_PyText_Check(pretty)) {
if (const char* s = cpyrt_PyText_AsString(pretty))
pv = s;
else
PyErr_Clear();
} else if (CPPInstance_Check(pretty) &&
((CPPInstance*)pretty)->GetObject()) {
pv = *(std::string*)((CPPInstance*)pretty)->GetObject();
}
// an address or the generic fallback means no usable pretty printer
if (!pv.empty() && pv.find("@0x") == std::string::npos &&
pv != "{not representable}")
result = cpyrt_PyText_FromString(pv.c_str());
Py_DECREF(pretty);
if (result)
Expand Down
Loading