From 8b91edadc06dcb0d391a65d1ecdf07dcb429df1b Mon Sep 17 00:00:00 2001 From: sth Date: Sun, 10 Mar 2019 11:29:14 +0100 Subject: bpo-36251: Fix format strings used in match_repr() and stdprinter_repr(). (GH-12252) --- Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst | 2 ++ Modules/_sre.c | 2 +- Objects/fileobject.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst diff --git a/Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst b/Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst new file mode 100644 index 0000000..5138b0a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst @@ -0,0 +1,2 @@ +Fix format strings used for stderrprinter and re.Match reprs. Patch by +Stephan Hohe. diff --git a/Modules/_sre.c b/Modules/_sre.c index 5cea756..014cc54 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -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); diff --git a/Objects/fileobject.c b/Objects/fileobject.c index babaa05..39c7c10 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -411,7 +411,7 @@ stdprinter_fileno(PyStdPrinter_Object *self, PyObject *Py_UNUSED(ignored)) static PyObject * stdprinter_repr(PyStdPrinter_Object *self) { - return PyUnicode_FromFormat("", + return PyUnicode_FromFormat("", self->fd, self); } -- cgit v0.12