traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #27981: Merge from 3.6

This commit is contained in:
Berker Peksag 2016-09-13 07:40:02 +03:00
parent e4c16fa364 0037352d9d
commit ae66e6962e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Parser/tokenizer.c
View File

@ -497,7 +497,7 @@ error:
static int
fp_setreadl(struct tok_state *tok, const char* enc)
{
PyObject *readline = NULL, *stream = NULL, *io = NULL;
PyObject *readline = NULL, *stream = NULL, *io = NULL, *bufobj;
_Py_IDENTIFIER(open);
_Py_IDENTIFIER(readline);
int fd;
@ -528,9 +528,12 @@ fp_setreadl(struct tok_state *tok, const char* enc)
readline = _PyObject_GetAttrId(stream, &PyId_readline);
Py_XSETREF(tok->decoding_readline, readline);
if (pos > 0) {
if (PyObject_CallObject(readline, NULL) == NULL) {
bufobj = PyObject_CallObject(readline, NULL);
if (bufobj == NULL) {
readline = NULL;
goto cleanup;
} else {
Py_DECREF(bufobj);
}
}