mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rolled back revisions 85003 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k
This commit is contained in:
Benjamin Peterson 2010-09-25 03:27:12 +00:00
parent 2af840455e
commit da4fabac87
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -15,9 +15,6 @@ 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); argcount + kwcount);
goto fail; goto fail;
} }
n = co->co_argcount; n = co->co_argcount;