From 04b01dc8f78ee8a549e6011ee26d8de5cc6184c4 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 21 Jul 2013 13:26:13 -0700 Subject: let's not return NULL from functions that should return ints --- Python/traceback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/traceback.c b/Python/traceback.c index 1f611ba..d19c594 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -258,7 +258,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent) if (fd < 0) { Py_DECREF(io); Py_DECREF(binary); - return NULL; + return 0; } found_encoding = PyTokenizer_FindEncodingFilename(fd, filename); encoding = (found_encoding != NULL) ? found_encoding : "utf-8"; @@ -267,7 +267,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent) Py_DECREF(io); Py_DECREF(binary); PyMem_FREE(found_encoding); - return PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, filename); + return 0; } fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding); Py_DECREF(io); -- cgit v0.12