revert r85003, poorly considered; breaks tests

benjaminp · benjaminp · commit aa7fbd956451 · 2010-09-25T03:25:42.000Z
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,9 +10,6 @@ What's New in Python 3.2 Alpha 3?
 Core and Builtins
 -----------------
 
-- Issue #9943: Improve the TypeError raised for passing too many positional
-  arguments.
-
 - Issue #9930: Remove bogus subtype check that was causing (e.g.)
   float.__rdiv__(2.0, 3) to return NotImplemented instead of the
   expected 1.5.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3104,7 +3104,7 @@ PyEval_EvalCodeEx(PyCodeObject *co, PyObject *globals, PyObject *locals,
                     defcount ? "at most" : "exactly",
                     co->co_argcount,
                     co->co_argcount == 1 ? "" : "s",
-                    argcount);
+                    argcount + kwcount);
                 goto fail;
             }
             n = co->co_argcount;

Original file line number	Diff line number	Diff line change
`@@ -3104,7 +3104,7 @@ PyEval_EvalCodeEx(PyCodeObject co, PyObject globals, PyObject *locals,`
`3104`	`3104`	`defcount ? "at most" : "exactly",`
`3105`	`3105`	`co->co_argcount,`
`3106`	`3106`	`co->co_argcount == 1 ? "" : "s",`
`3107`		`- argcount);`
	`3107`	`+ argcount + kwcount);`
`3108`	`3108`	`goto fail;`
`3109`	`3109`	`}`
`3110`	`3110`	`n = co->co_argcount;`