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
........
This commit is contained in:
Benjamin Peterson 2010-04-16 23:00:54 +00:00
parent c218ce86c4
commit 0aabda7939
1 changed files with 1 additions and 2 deletions

View File

@ -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");