Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
sth 2019-03-10 11:29:14 +01:00 committed by Serhiy Storchaka
parent ca7fe50635
commit 8b91edadc0
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst Normal file
View File

@ -0,0 +1,2 @@
Fix format strings used for stderrprinter and re.Match reprs. Patch by
Stephan Hohe.

2
Modules/_sre.c
View File

@ -2306,7 +2306,7 @@ match_repr(MatchObject *self)
if (group0 == NULL) if (group0 == NULL)
return NULL; return NULL;
result = PyUnicode_FromFormat( result = PyUnicode_FromFormat(
"<%s object; span=(%d, %d), match=%.50R>", "<%s object; span=(%zd, %zd), match=%.50R>",
Py_TYPE(self)->tp_name, Py_TYPE(self)->tp_name,
self->mark[0], self->mark[1], group0); self->mark[0], self->mark[1], group0);
Py_DECREF(group0); Py_DECREF(group0);

2
Objects/fileobject.c
View File

@ -411,7 +411,7 @@ stdprinter_fileno(PyStdPrinter_Object *self, PyObject *Py_UNUSED(ignored))
static PyObject * static PyObject *
stdprinter_repr(PyStdPrinter_Object *self) 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); self->fd, self);
} }