]> granicus.if.org Git - python/commitdiff
Merged revisions 78028 via svnmerge from
authorBenjamin Peterson <benjamin@python.org>
Sun, 21 Mar 2010 21:12:03 +0000 (21:12 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sun, 21 Mar 2010 21:12:03 +0000 (21:12 +0000)
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
........

Python/ceval.c

index 9be0bd6fa655c8f48b26fa328f79f11e1e646466..22c61550bf908aa572388721f6d6569b2cfd89e4 100644 (file)
@@ -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 "