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

sth · serhiy-storchaka · commit 8b91edadc06d · 2019-03-10T12:29:14.000+02:00
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
@@ -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
@@ -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
@@ -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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix format strings used for stderrprinter and re.Match reprs. Patch by`
	`2`	`+Stephan Hohe.`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ stdprinter_fileno(PyStdPrinter_Object self, PyObject Py_UNUSED(ignored))`
`411`	`411`	`static PyObject *`
`412`	`412`	`stdprinter_repr(PyStdPrinter_Object *self)`
`413`	`413`	`{`
`414`		`- return PyUnicode_FromFormat("<stdprinter(fd=%d) object at 0x%x>",`
	`414`	`+ return PyUnicode_FromFormat("<stdprinter(fd=%d) object at %p>",`
`415`	`415`	`self->fd, self);`
`416`	`416`	`}`
`417`	`417`