diff options
| author | Fred Drake <fdrake@acm.org> | 2000-06-01 03:12:13 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2000-06-01 03:12:13 (GMT) |
| commit | b6a9ada757a99023e286addc6f2947747a8105ec (patch) | |
| tree | d79372c01437217f7a14663ddf379f487dd73cf8 | |
| parent | 94c3452ade3dbc2c09e772b0507084551fe49b4c (diff) | |
| download | cpython-b6a9ada757a99023e286addc6f2947747a8105ec.zip cpython-b6a9ada757a99023e286addc6f2947747a8105ec.tar.gz cpython-b6a9ada757a99023e286addc6f2947747a8105ec.tar.bz2 | |
Michael Hudson <mwh21@cam.ac.uk>:
Removed PyErr_BadArgument() calls and replaced them with more useful
error messages.
| -rw-r--r-- | Objects/listobject.c | 8 | ||||
| -rw-r--r-- | Objects/stringobject.c | 4 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index f70d19b..661a53b 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -388,7 +388,9 @@ list_concat(a, bb) int i; PyListObject *np; if (!PyList_Check(bb)) { - PyErr_BadArgument(); + PyErr_Format(PyExc_TypeError, + "can only append list (not \"%.200s\") to list", + bb->ob_type->tp_name); return NULL; } #define b ((PyListObject *)bb) @@ -469,7 +471,9 @@ list_ass_slice(a, ilow, ihigh, v) } } else { - PyErr_BadArgument(); + PyErr_Format(PyExc_TypeError, + "must assign list (not \"%.200s\") to slice", + v->ob_type->tp_name); return -1; } if (ilow < 0) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index f17fbf1..ce6548b 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -293,7 +293,9 @@ string_concat(a, bb) if (!PyString_Check(bb)) { if (PyUnicode_Check(bb)) return PyUnicode_Concat((PyObject *)a, bb); - PyErr_BadArgument(); + PyErr_Format(PyExc_TypeError, + "cannot add type \"%.200s\" to string", + bb->ob_type->tp_name); return NULL; } #define b ((PyStringObject *)bb) diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index d5d6a07..c26b7df 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -361,7 +361,9 @@ tupleconcat(a, bb) register int i; PyTupleObject *np; if (!PyTuple_Check(bb)) { - PyErr_BadArgument(); + PyErr_Format(PyExc_TypeError, + "can only append tuple (not \"%.200s\") to tuple", + bb->ob_type->tp_name); return NULL; } #define b ((PyTupleObject *)bb) |