Merged revisions 85003 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85003 | benjamin.peterson | 2010-09-24 22:14:33 -0500 (Fri, 24 Sep 2010) | 1 line

  don't count keyword arguments as positional #9943
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 77adf82beba1573f587b21cab5110b092423fa7f..e42bb16d57560784fdec9522592ca4de86755ee7 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
 - Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
   thread-local storage key.
 
+- Issue #9943: Improve the TypeError raised for passing too many positional
+  arguments.
+
 - Issue #4947: The write() method of sys.stdout and sys.stderr uses their
   encoding and errors attributes instead of using utf-8 in strict mode, to get
   the same behaviour than the print statement.

diff --git a/Python/ceval.c b/Python/ceval.c
index 673eac2ed42ffbfc245187f2707f27a7a26bed3e..921cb48699b11d1d97892dd83af02bc4d5729dea 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3059,7 +3059,7 @@ PyEval_EvalCodeEx(PyCodeObject *co, PyObject *globals, PyObject *locals,
                     defcount ? "at most" : "exactly",
                     co->co_argcount,
                     co->co_argcount == 1 ? "" : "s",
-                    argcount + kwcount);
+                    argcount);
                 goto fail;
             }
             n = co->co_argcount;