Michael Hudson <mwh21@cam.ac.uk>:

freddrake · freddrake · commit b6a9ada757a9 · 2000-06-01T03:12:13.000Z
Removed PyErr_BadArgument() calls and replaced them with more useful
error messages.
diff --git 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
@@ -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
@@ -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)

Original file line number	Original file line	Diff line number	Diff line change
`@@ -388,7 +388,9 @@ list_concat(a, bb)`
`388`	`int i;`	`388`	`int i;`
`389`	`PyListObject *np;`	`389`	`PyListObject *np;`
`390`	`if (!PyList_Check(bb)) {`	`390`	`if (!PyList_Check(bb)) {`
`391`	`- PyErr_BadArgument();`	`391`	`+ PyErr_Format(PyExc_TypeError,`
		`392`	`+ "can only append list (not \"%.200s\") to list",`
		`393`	`+ bb->ob_type->tp_name);`
`392`	`return NULL;`	`394`	`return NULL;`
`393`	`}`	`395`	`}`
`394`	`#define b ((PyListObject *)bb)`	`396`	`#define b ((PyListObject *)bb)`
`@@ -469,7 +471,9 @@ list_ass_slice(a, ilow, ihigh, v)`
`469`	`}`	`471`	`}`
`470`	`}`	`472`	`}`
`471`	`else {`	`473`	`else {`
`472`	`- PyErr_BadArgument();`	`474`	`+ PyErr_Format(PyExc_TypeError,`
		`475`	`+ "must assign list (not \"%.200s\") to slice",`
		`476`	`+ v->ob_type->tp_name);`
`473`	`return -1;`	`477`	`return -1;`
`474`	`}`	`478`	`}`
`475`	`if (ilow < 0)`	`479`	`if (ilow < 0)`
Original file line number	Original file line	Diff line number	Diff line change
`@@ -293,7 +293,9 @@ string_concat(a, bb)`
`293`	`if (!PyString_Check(bb)) {`	`293`	`if (!PyString_Check(bb)) {`
`294`	`if (PyUnicode_Check(bb))`	`294`	`if (PyUnicode_Check(bb))`
`295`	`return PyUnicode_Concat((PyObject *)a, bb);`	`295`	`return PyUnicode_Concat((PyObject *)a, bb);`
`296`	`- PyErr_BadArgument();`	`296`	`+ PyErr_Format(PyExc_TypeError,`
		`297`	`+ "cannot add type \"%.200s\" to string",`
		`298`	`+ bb->ob_type->tp_name);`
`297`	`return NULL;`	`299`	`return NULL;`
`298`	`}`	`300`	`}`
`299`	`#define b ((PyStringObject *)bb)`	`301`	`#define b ((PyStringObject *)bb)`
Original file line number	Original file line	Diff line number	Diff line change
`@@ -361,7 +361,9 @@ tupleconcat(a, bb)`
`361`	`register int i;`	`361`	`register int i;`
`362`	`PyTupleObject *np;`	`362`	`PyTupleObject *np;`
`363`	`if (!PyTuple_Check(bb)) {`	`363`	`if (!PyTuple_Check(bb)) {`
`364`	`- PyErr_BadArgument();`	`364`	`+ PyErr_Format(PyExc_TypeError,`
		`365`	`+ "can only append tuple (not \"%.200s\") to tuple",`
		`366`	`+ bb->ob_type->tp_name);`
`365`	`return NULL;`	`367`	`return NULL;`
`366`	`}`	`368`	`}`
`367`	`#define b ((PyTupleObject *)bb)`	`369`	`#define b ((PyTupleObject *)bb)`