diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-09-25 03:27:12 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-09-25 03:27:12 +0000 |
| commit | da4fabac8744bbd9aa787b37b506695a70e768b3 (patch) | |
| tree | eee32a882ac0ad891ffd7ef4d5d4b15aee8def38 | |
| parent | 2af840455e8ac7b88964e7b15f3e7a4e848e1a90 (diff) | |
| download | cpython-git-da4fabac8744bbd9aa787b37b506695a70e768b3.tar.gz | |
Rolled back revisions 85003 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/ceval.c | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -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 index 921cb48699..673eac2ed4 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); + argcount + kwcount); goto fail; } n = co->co_argcount; |