diff options
| author | sth <sth.dev@tejp.de> | 2019-03-10 10:29:14 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2019-03-10 10:29:14 (GMT) |
| commit | 8b91edadc06dcb0d391a65d1ecdf07dcb429df1b (patch) | |
| tree | 79f520e5bc745275befe1a2163e3306131db7527 | |
| parent | ca7fe5063593958e5efdf90f068582837f07bd14 (diff) | |
| download | cpython-8b91edadc06dcb0d391a65d1ecdf07dcb429df1b.zip cpython-8b91edadc06dcb0d391a65d1ecdf07dcb429df1b.tar.gz cpython-8b91edadc06dcb0d391a65d1ecdf07dcb429df1b.tar.bz2 | |
bpo-36251: Fix format strings used in match_repr() and stdprinter_repr(). (GH-12252)
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-03-09-18-01-24.bpo-36251.zOp9l0.rst | 2 | ||||
| -rw-r--r-- | Modules/_sre.c | 2 | ||||
| -rw-r--r-- | Objects/fileobject.c | 2 |
3 files changed, 4 insertions, 2 deletions
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("<stdprinter(fd=%d) object at 0x%x>", + return PyUnicode_FromFormat("<stdprinter(fd=%d) object at %p>", self->fd, self); } |