]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
let's not return NULL from functions that should return ints
authorBenjamin Peterson <benjamin@python.org>
Sun, 21 Jul 2013 20:26:13 +0000 (13:26 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 21 Jul 2013 20:26:13 +0000 (13:26 -0700)
Python/traceback.c

index 1f611ba1d5152c6fd753280148b9eb28c196db38..d19c59448c34df978f89f42f58620102ee317403 100644 (file)
@@ -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);