Rolled back revisions 85003 via svnmerge from

benjamin.peterson · benjamin.peterson · commit c9258ea59f80 · 2010-09-25T03:27:12.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k git-svn-id: http://svn.python.org/projects/python/branches/release27-maint@85006 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -15,9 +15,6 @@ 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
@@ -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);
+                    argcount + kwcount);
                 goto fail;
             }
             n = co->co_argcount;

Original file line number	Diff line number	Diff line change
`@@ -3059,7 +3059,7 @@ PyEval_EvalCodeEx(PyCodeObject co, PyObject globals, PyObject *locals,`
`3059`	`3059`	`defcount ? "at most" : "exactly",`
`3060`	`3060`	`co->co_argcount,`
`3061`	`3061`	`co->co_argcount == 1 ? "" : "s",`
`3062`		`- argcount);`
	`3062`	`+ argcount + kwcount);`
`3063`	`3063`	`goto fail;`
`3064`	`3064`	`}`
`3065`	`3065`	`n = co->co_argcount;`