Skip to content

GH-122123: show all named fields in the PyStructSequence repr #122124

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
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

GH-122123: show all named fields in the PyStructSequence repr #122124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3f8edf
GH-122123: show all field in the PyStructSequence repr
FFY00 Jul 22, 2024
a752551
skip unnamed fields
FFY00 Jul 22, 2024
4b04944
add news
FFY00 Jul 22, 2024
53cd4c4
fix news
FFY00 Jul 22, 2024
2f5b59a
actually fix news :/
FFY00 Jul 22, 2024
b3e76fa
Merge branch 'main' into gh-122123-structseq_repr
FFY00 Sep 20, 2024
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/C API/2024-07-22-14-31-21.gh-issue-122123.l7-cEu.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The repr for ``PyStructSequence`` objects now includes all named fields.
8 changes: 3 additions & 5 deletions Objects/structseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ structseq_repr(PyStructSequence *obj)
writer.overallocate = 1;
/* count 5 characters per item: "x=1, " */
writer.min_length = (PyUnicode_GET_LENGTH(type_name) + 1
+ VISIBLE_SIZE(obj) * 5 + 1);
+ REAL_SIZE(obj) * 5 + 1);

if (_PyUnicodeWriter_WriteStr(&writer, type_name) < 0) {
Py_DECREF(type_name);
Expand All @@ -292,7 +292,7 @@ structseq_repr(PyStructSequence *obj)
goto error;
}

for (Py_ssize_t i=0; i < VISIBLE_SIZE(obj); i++) {
for (Py_ssize_t i=0; i < REAL_SIZE(obj); i++) {
if (i > 0) {
/* Write ", " */
if (_PyUnicodeWriter_WriteASCIIString(&writer, ", ", 2) < 0) {
Expand All @@ -303,9 +303,7 @@ structseq_repr(PyStructSequence *obj)
/* Write "name=repr" */
const char *name_utf8 = typ->tp_members[i].name;
if (name_utf8 == NULL) {
PyErr_Format(PyExc_SystemError, "In structseq_repr(), member %zd name is NULL"
" for type %.500s", i, typ->tp_name);
goto error;
continue;
}

PyObject *name = PyUnicode_DecodeUTF8(name_utf8, strlen(name_utf8), NULL);
Expand Down
Loading