summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-09-25 03:14:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-09-25 03:14:33 (GMT)
commit81437c90253c5862791781613305d920e8e9c53b (patch)
tree2c8ccc2aaec5b6c42403e280ba08148d27a85c52
parenta847c81914bfce3d7b54eccf2494aa15cf750539 (diff)
downloadcpython-81437c90253c5862791781613305d920e8e9c53b.zip
cpython-81437c90253c5862791781613305d920e8e9c53b.tar.gz
cpython-81437c90253c5862791781613305d920e8e9c53b.tar.bz2
don't count keyword arguments as positional #9943
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/ceval.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 489d6a9..8d7f328 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ 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 48b5678..84781be 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 + kwcount);
+ argcount);
goto fail;
}
n = co->co_argcount;