1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use PyArg_ParseTuple (new API) instead of PyArg_Parse (old API) for parsing tuples.

Browse Source
This commit is contained in:
Serhiy Storchaka 2015-04-19 20:38:19 +03:00
parent 5cc9c4fdf7
commit bb72c47996
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/_io/textio.c
View File

@ -538,7 +538,7 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
_PyIO_str_getstate, NULL); _PyIO_str_getstate, NULL);
if (state == NULL) if (state == NULL)
return NULL; return NULL;
if (!PyArg_Parse(state, "(OK)", &buffer, &flag)) { if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) {
Py_DECREF(state); Py_DECREF(state);
return NULL; return NULL;
} }
@ -569,7 +569,7 @@ _io_IncrementalNewlineDecoder_setstate(nldecoder_object *self,
PyObject *buffer; PyObject *buffer;
unsigned PY_LONG_LONG flag; unsigned PY_LONG_LONG flag;
if (!PyArg_Parse(state, "(OK)", &buffer, &flag)) if (!PyArg_ParseTuple(state, "OK", &buffer, &flag))
return NULL; return NULL;
self->pendingcr = (int) (flag & 1); self->pendingcr = (int) (flag & 1);
@ -1449,7 +1449,7 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
/* Given this, we know there was a valid snapshot point /* Given this, we know there was a valid snapshot point
* len(dec_buffer) bytes ago with decoder state (b'', dec_flags). * len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
*/ */
if (PyArg_Parse(state, "(OO)", &dec_buffer, &dec_flags) < 0) { if (PyArg_ParseTuple(state, "OO", &dec_buffer, &dec_flags) < 0) {
Py_DECREF(state); Py_DECREF(state);
return -1; return -1;
} }
@ -2305,7 +2305,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
goto fail; goto fail;
/* Skip backward to the snapshot point (see _read_chunk). */ /* Skip backward to the snapshot point (see _read_chunk). */
if (!PyArg_Parse(self->snapshot, "(iO)", &cookie.dec_flags, &next_input)) if (!PyArg_ParseTuple(self->snapshot, "iO", &cookie.dec_flags, &next_input))
goto fail; goto fail;
assert (PyBytes_Check(next_input)); assert (PyBytes_Check(next_input));
@ -2331,7 +2331,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
_PyIO_str_getstate, NULL); \ _PyIO_str_getstate, NULL); \
if (_state == NULL) \ if (_state == NULL) \
goto fail; \ goto fail; \
if (!PyArg_Parse(_state, "(y#i)", &dec_buffer, &dec_buffer_len, &dec_flags)) { \ if (!PyArg_ParseTuple(_state, "y#i", &dec_buffer, &dec_buffer_len, &dec_flags)) { \
Py_DECREF(_state); \ Py_DECREF(_state); \
goto fail; \ goto fail; \
} \ } \