From 3766572a488562b06e54d2484fb184eb3c87a9e0 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 20 Aug 2016 21:22:03 +0300 Subject: [PATCH] Issue #27692: Removed unnecessary NULL checks in exceptions.c. Patch by Xiang Zhang. --- Objects/exceptions.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Objects/exceptions.c b/Objects/exceptions.c index f829d32c996..e85d743dab0 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -230,7 +230,7 @@ BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb) return -1; } - Py_XINCREF(tb); + Py_INCREF(tb); Py_XSETREF(self->traceback, tb); return 0; } @@ -985,7 +985,7 @@ OSError_init(PyOSErrorObject *self, PyObject *args, PyObject *kwds) return 0; error: - Py_XDECREF(args); + Py_DECREF(args); return -1; } @@ -1065,8 +1065,7 @@ OSError_str(PyOSErrorObject *self) } if (self->myerrno && self->strerror) return PyUnicode_FromFormat("[Errno %S] %S", - self->myerrno ? self->myerrno: Py_None, - self->strerror ? self->strerror: Py_None); + self->myerrno, self->strerror); return BaseException_str((PyBaseExceptionObject *)self); }