From 1721e757499db93373cba263b0553a64d4c545a3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 30 Mar 2008 19:43:27 +0000 Subject: Fix error message -- "expects either 0 or 0 arguments" --- Parser/asdl_c.py | 6 ++++-- Python/Python-ast.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 08592bc..29e2547 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -595,8 +595,10 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw) res = 0; /* if no error occurs, this stays 0 to the end */ if (PyTuple_GET_SIZE(args) > 0) { if (numfields != PyTuple_GET_SIZE(args)) { - PyErr_Format(PyExc_TypeError, "%.400s constructor takes either 0 or " - "%d positional argument%s", Py_TYPE(self)->tp_name, + PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s" + "%" PY_FORMAT_SIZE_T "d positional argument%s", + Py_TYPE(self)->tp_name, + numfields == 0 ? "" : "either 0 or ", numfields, numfields == 1 ? "" : "s"); res = -1; goto cleanup; diff --git a/Python/Python-ast.c b/Python/Python-ast.c index d473418..ba310e6 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -386,8 +386,10 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw) res = 0; /* if no error occurs, this stays 0 to the end */ if (PyTuple_GET_SIZE(args) > 0) { if (numfields != PyTuple_GET_SIZE(args)) { - PyErr_Format(PyExc_TypeError, "%.400s constructor takes either 0 or " - "%d positional argument%s", Py_TYPE(self)->tp_name, + PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s" + "%" PY_FORMAT_SIZE_T "d positional argument%s", + Py_TYPE(self)->tp_name, + numfields == 0 ? "" : "either 0 or ", numfields, numfields == 1 ? "" : "s"); res = -1; goto cleanup; -- cgit v0.12