diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-09-25 03:25:42 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-09-25 03:25:42 (GMT) |
| commit | aa7fbd956451b37f794eb50da9738b970a6f73cb (patch) | |
| tree | 5f5a590364b47d00bb90d5884b72b4bee22722ef | |
| parent | 81437c90253c5862791781613305d920e8e9c53b (diff) | |
| download | cpython-aa7fbd956451b37f794eb50da9738b970a6f73cb.zip cpython-aa7fbd956451b37f794eb50da9738b970a6f73cb.tar.gz cpython-aa7fbd956451b37f794eb50da9738b970a6f73cb.tar.bz2 | |
revert r85003, poorly considered; breaks tests
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/ceval.c | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -10,9 +10,6 @@ What's New in Python 3.2 Alpha 3? Core and Builtins ----------------- -- Issue #9943: Improve the TypeError raised for passing too many positional - arguments. - - Issue #9930: Remove bogus subtype check that was causing (e.g.) float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5. diff --git a/Python/ceval.c b/Python/ceval.c index 84781be..48b5678 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3104,7 +3104,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; |