mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 85003 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2010-09-25 03:17:56 +00:00
parent a3c16785b3
commit 2af840455e
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -15,6 +15,9 @@ Core and Builtins
- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid - Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
thread-local storage key. 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 - 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 encoding and errors attributes instead of using utf-8 in strict mode, to get
the same behaviour than the print statement. the same behaviour than the print statement.

2
Python/ceval.c
View file

@ -3059,7 +3059,7 @@ PyEval_EvalCodeEx(PyCodeObject *co, PyObject *globals, PyObject *locals,
defcount ? "at most" : "exactly", defcount ? "at most" : "exactly",
co->co_argcount, co->co_argcount,
co->co_argcount == 1 ? "" : "s", co->co_argcount == 1 ? "" : "s",
argcount + kwcount); argcount);
goto fail; goto fail;
} }
n = co->co_argcount; n = co->co_argcount;