From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 21 Mar 2010 21:12:03 +0000 (+0000)
Subject: Merged revisions 78028 via svnmerge from
X-Git-Tag: v3.2a1~1365
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3b7a25a218b76a8b31e49e592e3bda9ca2e1f13;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78028 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78028 | benjamin.peterson | 2010-02-06 13:40:18 -0600 (Sat, 06 Feb 2010) | 1 line

  remove pointless error checking
........
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 9be0bd6fa655..22c61550bf90 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3130,9 +3130,6 @@ PyEval_EvalCodeEx(PyCodeObject *co, PyObject *globals, PyObject *locals,
 				else if (cmp < 0)
 					goto fail;
 			}
-			/* Check errors from Compare */
-			if (PyErr_Occurred())
-				goto fail;
 			if (j >= total_args && kwdict == NULL) {
 				PyErr_Format(PyExc_TypeError,
 					     "%U() got an unexpected "