[Python-checkins] r79243 - in python/branches/py3k: Python/ceval.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Mar 21 22:12:03 2010
New Revision: 79243

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Python/ceval.c

Modified: python/branches/py3k/Python/ceval.c
==============================================================================
--- python/branches/py3k/Python/ceval.c	(original)
+++ python/branches/py3k/Python/ceval.c	Sun Mar 21 22:12:03 2010
@@ -3130,9 +3130,6 @@
 				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 "