Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
The repr for ``PyStructSequence`` objects now includes all named fields.

# Write your Misc/NEWS entry below. It should be a simple ReST paragraph. #
Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
stuff.
###########################################################################
8 changes: 3 additions & 5 deletions Objects/structseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,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 @@ -281,7 +281,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 @@ -292,9 +292,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