diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-16 23:00:53 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-16 23:00:53 (GMT) |
| commit | 9c0e94f95cb7c72da3554ead8b5b255455e6caae (patch) | |
| tree | 338c4b091e97c57b5d13f2c8c99e728d84a22a53 /Objects | |
| parent | 8380dd5aa42372929fe962ebdc3c180d929e497a (diff) | |
| download | cpython-9c0e94f95cb7c72da3554ead8b5b255455e6caae.zip cpython-9c0e94f95cb7c72da3554ead8b5b255455e6caae.tar.gz cpython-9c0e94f95cb7c72da3554ead8b5b255455e6caae.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 4d32ea7..165ccae 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -757,8 +757,7 @@ bytearray_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"); |