revert r85003, poorly considered; breaks tests

diff --git a/Misc/NEWS b/Misc/NEWS
index 8d7f3287e26675e3fdeda8acb30d6b648c1319f9..489d6a96735937c6223767ced18c944e0a6ea6e1 100644 (file)
--- 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
index 84781be32f824850e30372503d398548503658f9..48b567865296ff15ea6d769f130669262b194ad9 100644 (file)
--- 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;