From aa7fbd956451b37f794eb50da9738b970a6f73cb Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Sep 2010 03:25:42 +0000
Subject: [PATCH] revert r85003, poorly considered; breaks tests

---
 Misc/NEWS      | 3 ---
 Python/ceval.c | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 8d7f3287e26..489d6a96735 100644
--- 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 84781be32f8..48b56786529 100644
--- 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;