revert r85003, poorly considered; breaks tests

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.

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;