[Python-checkins] r80130 - in python/branches/py3k: Objects/bytearrayobject.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Apr 17 01:00:53 2010
New Revision: 80130

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/py3k/   (props changed)
   python/branches/py3k/Objects/bytearrayobject.c

Modified: python/branches/py3k/Objects/bytearrayobject.c
==============================================================================
--- python/branches/py3k/Objects/bytearrayobject.c	(original)
+++ python/branches/py3k/Objects/bytearrayobject.c	Sat Apr 17 01:00:53 2010
@@ -757,8 +757,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");