From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 21 Jul 2013 20:26:13 +0000 (-0700)
Subject: let's not return NULL from functions that should return ints
X-Git-Tag: v3.4.0a1~115^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04b01dc8f78ee8a549e6011ee26d8de5cc6184c4;p=thirdparty%2FPython%2Fcpython.git

let's not return NULL from functions that should return ints
---

diff --git a/Python/traceback.c b/Python/traceback.c
index 1f611ba1d515..d19c59448c34 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);