From 0aabda79396c4073c256030b6528991d4d0447e6 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 16 Apr 2010 23:00:54 +0000 Subject: [PATCH] Merged revisions 80129 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80129 | benjamin.peterson | 2010-04-16 17:52:44 -0500 (Fri, 16 Apr 2010) | 1 line tiny simplification ........ --- Objects/bytearrayobject.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index cdcfcb42d0b..648aad8291b 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -834,8 +834,7 @@ bytes_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds) if (count == -1 && PyErr_Occurred()) { if (PyErr_ExceptionMatches(PyExc_OverflowError)) return -1; - else - PyErr_Clear(); + PyErr_Clear(); } else if (count < 0) { PyErr_SetString(PyExc_ValueError, "negative count");