summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-21 21:12:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-21 21:12:03 (GMT)
commitf3b7a25a218b76a8b31e49e592e3bda9ca2e1f13 (patch)
treeb4f0772f9eea3fdee10177b9cf40146ea7f459e5
parent232ecb8918d90b62e914f2ddfaa91e3d02fac9e8 (diff)
downloadcpython-f3b7a25a218b76a8b31e49e592e3bda9ca2e1f13.zip
cpython-f3b7a25a218b76a8b31e49e592e3bda9ca2e1f13.tar.gz
cpython-f3b7a25a218b76a8b31e49e592e3bda9ca2e1f13.tar.bz2
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 ........
-rw-r--r--Python/ceval.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 9be0bd6..22c6155 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 "