From: sth <sth.dev@tejp.de>
Date: Sun, 10 Mar 2019 10:29:14 +0000 (+0100)
Subject: bpo-36251: Fix format strings used in match_repr() and stdprinter_repr(). (GH-12252)
X-Git-Tag: v3.8.0a3~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b91edadc06dcb0d391a65d1ecdf07dcb429df1b;p=thirdparty%2FPython%2Fcpython.git

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

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 000000000000..5138b0a0cb8b
--- /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 5cea7562f280..014cc546e345 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 babaa05bdbc4..39c7c109979a 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("<stdprinter(fd=%d) object at 0x%x>",
+    return PyUnicode_FromFormat("<stdprinter(fd=%d) object at %p>",
                                 self->fd, self);
 }