summaryrefslogtreecommitdiff
path: root/Parser/tokenizer.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 +0000
committerMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 +0000
commit23352add84278fc0476b2d6599489fbb70c9f5bc (patch)
tree600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Parser/tokenizer.c
parent6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff)
parent0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff)
downloadcpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Parser/tokenizer.c')
-rw-r--r--Parser/tokenizer.c6
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;