summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-11-19 16:05:40 (GMT)
committerGuido van Rossum <guido@python.org>1997-11-19 16:05:40 (GMT)
commitdf9db1ea1882bc4274a005415c48d255df9c43d5 (patch)
tree08b015cc0d9c6956f8511d67f00663172641be08
parent127b8dd8d49425ee34a4b4b88966772f47239d97 (diff)
downloadcpython-df9db1ea1882bc4274a005415c48d255df9c43d5.zip
cpython-df9db1ea1882bc4274a005415c48d255df9c43d5.tar.gz
cpython-df9db1ea1882bc4274a005415c48d255df9c43d5.tar.bz2
Give more detailed error message when the argument count isn't right.
-rw-r--r--Python/ceval.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index fb179d1..fad8c2b 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -454,8 +454,9 @@ eval_code2(co, globals, locals,
}
if (argcount > co->co_argcount) {
if (!(co->co_flags & CO_VARARGS)) {
- PyErr_SetString(PyExc_TypeError,
- "too many arguments");
+ PyErr_Format(PyExc_TypeError,
+ "too many arguments; expected %d, got %d",
+ co->co_argcount, argcount);
goto fail;
}
n = co->co_argcount;
@@ -513,8 +514,9 @@ eval_code2(co, globals, locals,
int m = co->co_argcount - defcount;
for (i = argcount; i < m; i++) {
if (GETLOCAL(i) == NULL) {
- PyErr_SetString(PyExc_TypeError,
- "not enough arguments");
+ PyErr_Format(PyExc_TypeError,
+ "not enough arguments; expected %d, got %d",
+ m, i);
goto fail;
}
}