Skip to content

bpo-36251: Fix format strings used in match_repr() and stdprinter_repr() #12252

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
merged 4 commits into from
Mar 10, 2019
Merged

bpo-36251: Fix format strings used in match_repr() and stdprinter_repr() #12252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ba088d
Fix format string in MatchObject repr
sth Mar 9, 2019
496648a
Fix format string in StdPrinter repr
sth Mar 9, 2019
ebbc37a
Add NEWS entry
sth Mar 9, 2019
7acc926
Update 2019-03-09-18-01-24.bpo-36251.zOp9l0.rst
serhiy-storchaka Mar 10, 2019
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix format strings used for stderrprinter and re.Match reprs. Patch by
Stephan Hohe.
2 changes: 1 addition & 1 deletion Modules/_sre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,7 @@ match_repr(MatchObject *self)
if (group0 == NULL)
return NULL;
result = PyUnicode_FromFormat(
"<%s object; span=(%d, %d), match=%.50R>",
"<%s object; span=(%zd, %zd), match=%.50R>",
Py_TYPE(self)->tp_name,
self->mark[0], self->mark[1], group0);
Py_DECREF(group0);
Expand Down
2 changes: 1 addition & 1 deletion Objects/fileobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ stdprinter_fileno(PyStdPrinter_Object *self, PyObject *Py_UNUSED(ignored))
static PyObject *
stdprinter_repr(PyStdPrinter_Object *self)
{
return PyUnicode_FromFormat("<stdprinter(fd=%d) object at 0x%x>",
return PyUnicode_FromFormat("<stdprinter(fd=%d) object at %p>",
self->fd, self);
}

Expand Down