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

merge 3.3

Browse Source
This commit is contained in:
Benjamin Peterson 2013-07-21 13:26:27 -07:00
commit 33113a3504
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Python/traceback.c
View File

@ -260,7 +260,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
if (fd < 0) { if (fd < 0) {
Py_DECREF(io); Py_DECREF(io);
Py_DECREF(binary); Py_DECREF(binary);
return NULL; return 0;
} }
found_encoding = PyTokenizer_FindEncodingFilename(fd, filename); found_encoding = PyTokenizer_FindEncodingFilename(fd, filename);
encoding = (found_encoding != NULL) ? found_encoding : "utf-8"; encoding = (found_encoding != NULL) ? found_encoding : "utf-8";
@ -269,7 +269,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
Py_DECREF(io); Py_DECREF(io);
Py_DECREF(binary); Py_DECREF(binary);
PyMem_FREE(found_encoding); PyMem_FREE(found_encoding);
return PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, filename); return 0;
} }
fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding); fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding);
Py_DECREF(io); Py_DECREF(io);