From 2af840455e8ac7b88964e7b15f3e7a4e848e1a90 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 25 Sep 2010 03:17:56 +0000 Subject: 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 ........ --- Misc/NEWS | 3 +++ Python/ceval.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 77adf82..e42bb16 100644 --- 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 673eac2..921cb48 100644 --- 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; -- cgit v0.12