diff options
author | Benjamin Peterson <benjamin@python.org> | 2017-01-31 23:31:20 -0800 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2017-01-31 23:31:20 -0800 |
commit | 75a56cd1847142d9c893b6df5fb674f54b34d9ed (patch) | |
tree | 73d254a7d8ed4bc2f76293a2b2e223c3f48e7dd4 /Parser/tokenizer.c | |
parent | bff21dc9e43eaf9549abe72a32d98a6c20de8c5b (diff) | |
parent | fcd15724f28a5249f13690af32dc12628ab186c6 (diff) | |
download | cpython-75a56cd1847142d9c893b6df5fb674f54b34d9ed.tar.gz |
merge 3.6 (#29398)
Diffstat (limited to 'Parser/tokenizer.c')
-rw-r--r-- | Parser/tokenizer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 0fa3aebc0f..10639ed774 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -440,7 +440,7 @@ fp_readl(char *s, int size, struct tok_state *tok) } else { - bufobj = PyObject_CallObject(tok->decoding_readline, NULL); + bufobj = _PyObject_CallNoArg(tok->decoding_readline); if (bufobj == NULL) goto error; } @@ -533,7 +533,7 @@ fp_setreadl(struct tok_state *tok, const char* enc) Py_XSETREF(tok->decoding_readline, readline); if (pos > 0) { - PyObject *bufobj = PyObject_CallObject(readline, NULL); + PyObject *bufobj = _PyObject_CallNoArg(readline); if (bufobj == NULL) return 0; Py_DECREF(bufobj); @@ -650,7 +650,7 @@ decoding_feof(struct tok_state *tok) } else { PyObject* buf = tok->decoding_buffer; if (buf == NULL) { - buf = PyObject_CallObject(tok->decoding_readline, NULL); + buf = _PyObject_CallNoArg(tok->decoding_readline); if (buf == NULL) { error_ret(tok); return 1; |