mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #28511: Use the "U" format instead of "O!" in PyArg_Parse*.

Browse source
This commit is contained in:
Serhiy Storchaka 2016-10-23 15:12:25 +03:00
parent 8c9331057d
commit f8d7d41507
5 changed files with 20 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Objects/exceptions.c
View file

@ -1820,18 +1820,10 @@ UnicodeEncodeError_init(PyObject *self, PyObject *args, PyObject *kwds)
Py_CLEAR(err->object);
Py_CLEAR(err->reason);
if (!PyArg_ParseTuple(args, "O!O!nnO!",
&PyUnicode_Type, &err->encoding,
&PyUnicode_Type, &err->object,
&err->start,
&err->end,
&PyUnicode_Type, &err->reason)) {
err->encoding = err->object = err->reason = NULL;
return -1;
}
if (PyUnicode_READY(err->object) < -1) {
err->encoding = NULL;
if (!PyArg_ParseTuple(args, "UUnnU",
&err->encoding, &err->object,
&err->start, &err->end, &err->reason)) {
err->encoding = err->object = err->reason = NULL;
return -1;
}
@ -1935,12 +1927,9 @@ UnicodeDecodeError_init(PyObject *self, PyObject *args, PyObject *kwds)
Py_CLEAR(ude->object);
Py_CLEAR(ude->reason);
if (!PyArg_ParseTuple(args, "O!OnnO!",
&PyUnicode_Type, &ude->encoding,
&ude->object,
&ude->start,
&ude->end,
&PyUnicode_Type, &ude->reason)) {
if (!PyArg_ParseTuple(args, "UOnnU",
&ude->encoding, &ude->object,
&ude->start, &ude->end, &ude->reason)) {
ude->encoding = ude->object = ude->reason = NULL;
return -1;
}
@ -2050,11 +2039,9 @@ UnicodeTranslateError_init(PyUnicodeErrorObject *self, PyObject *args,
Py_CLEAR(self->object);
Py_CLEAR(self->reason);
if (!PyArg_ParseTuple(args, "O!nnO!",
&PyUnicode_Type, &self->object,
&self->start,
&self->end,
&PyUnicode_Type, &self->reason)) {
if (!PyArg_ParseTuple(args, "UnnU",
&self->object,
&self->start, &self->end, &self->reason)) {
self->object = self->reason = NULL;
return -1;
}