Skip to content

gh-98421: Clean Up PyObject_Print #98422

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

Merged
encukou merged 2 commits into from
Oct 20, 2022
Merged

gh-98421: Clean Up PyObject_Print #98422

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0181e
clean up PyObject_Print
MonadChains Oct 18, 2022
9192ae2
address reviews
MonadChains Oct 19, 2022
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
13 changes: 2 additions & 11 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,10 @@ PyObject_Print(PyObject *op, FILE *fp, int flags)
s = PyObject_Str(op);
else
s = PyObject_Repr(op);
if (s == NULL)
if (s == NULL) {
ret = -1;
else if (PyBytes_Check(s)) {
fwrite(PyBytes_AS_STRING(s), 1,
PyBytes_GET_SIZE(s), fp);
}
else if (PyUnicode_Check(s)) {
else {
PyObject *t;
Comment thread
MonadChains marked this conversation as resolved.
Resolved
t = PyUnicode_AsEncodedString(s, "utf-8", "backslashreplace");
Comment thread
encukou marked this conversation as resolved.
Resolved
if (t == NULL) {
Expand All @@ -300,12 +297,6 @@ PyObject_Print(PyObject *op, FILE *fp, int flags)
Py_DECREF(t);
}
}
else {
PyErr_Format(PyExc_TypeError,
"str() or repr() returned '%.100s'",
Py_TYPE(s)->tp_name);
ret = -1;
}
Py_XDECREF(s);
Comment thread
MonadChains marked this conversation as resolved.
Resolved
}
}
Expand Down