Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.4 (traceback)

This commit is contained in:
Victor Stinner 2015-03-25 02:30:01 +01:00
parent 53345a40bc 81f241ab2e
commit 39183dfc68
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Python/traceback.c
View File

@ -309,13 +309,20 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
}
fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding);
Py_DECREF(io);
Py_DECREF(binary);
PyMem_FREE(found_encoding);
if (fob == NULL) {
PyErr_Clear();
res = _PyObject_CallMethodId(binary, &PyId_close, "");
Py_DECREF(binary);
if (res)
Py_DECREF(res);
else
PyErr_Clear();
return 0;
}
Py_DECREF(binary);
/* get the line number lineno */
for (i = 0; i < lineno; i++) {