[Python-checkins] r79219 - python/trunk/Python/ceval.c

Sun Mar 21 20:24:08 CET 2010

Author: benjamin.peterson
Date: Sun Mar 21 20:24:08 2010
New Revision: 79219
Log:
flatten condition
Modified:
 python/trunk/Python/ceval.c
Modified: python/trunk/Python/ceval.c
==============================================================================

--- python/trunk/Python/ceval.c	(original)
+++ python/trunk/Python/ceval.c	Sun Mar 21 20:24:08 2010
@@ -3177,14 +3177,12 @@
 			}
 		}
 	}
-	else {
-		if (argcount > 0 || kwcount > 0) {
-			PyErr_Format(PyExc_TypeError,
-				 "%.200s() takes no arguments (%d given)",
-				 PyString_AsString(co->co_name),
-				 argcount + kwcount);
-			goto fail;
-		}
+	else if (argcount > 0 || kwcount > 0) {
+		PyErr_Format(PyExc_TypeError,
+			 "%.200s() takes no arguments (%d given)",
+			 PyString_AsString(co->co_name),
+			 argcount + kwcount);
+		goto fail;
 	}
 	/* Allocate and initialize storage for cell vars, and copy free
 	 vars into frame. This isn't too efficient right now. */
