[Python-checkins] r80131 - in python/branches/release26-maint: Objects/bytearrayobject.c
benjamin.peterson
python-checkins at python.org
Sat Apr 17 01:00:54 CEST 2010
Author: benjamin.peterson
Date: Sat Apr 17 01:00:54 2010
New Revision: 80131
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Objects/bytearrayobject.c
Modified: python/branches/release26-maint/Objects/bytearrayobject.c
==============================================================================
--- python/branches/release26-maint/Objects/bytearrayobject.c (original)
+++ python/branches/release26-maint/Objects/bytearrayobject.c Sat Apr 17 01:00:54 2010
@@ -834,8 +834,7 @@
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");
More information about the Python-checkins
mailing list