diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-16 23:00:54 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-16 23:00:54 (GMT) |
| commit | 0aabda79396c4073c256030b6528991d4d0447e6 (patch) | |
| tree | 4faab8f5de395959fac5e5f4ceb7a47679c40681 /Objects | |
| parent | c218ce86c4aec619b532076e6c496bd3febd088c (diff) | |
| download | cpython-0aabda79396c4073c256030b6528991d4d0447e6.zip cpython-0aabda79396c4073c256030b6528991d4d0447e6.tar.gz cpython-0aabda79396c4073c256030b6528991d4d0447e6.tar.bz2 | |
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
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/bytearrayobject.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index cdcfcb4..648aad8 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"); |