traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Removed PyErr_BadArgument() calls and replaced them with more useful
error messages.
This commit is contained in:
Fred Drake 2000-06-01 02:02:46 +00:00
parent b5fc749c8b
commit 137507ea03
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/arraymodule.c
View File

@ -540,7 +540,9 @@ array_concat(a, bb)
int size;
arrayobject *np;
if (!is_arrayobject(bb)) {
PyErr_BadArgument();
PyErr_Format(PyExc_TypeError,
"can only append array (not \"%.200s\") to array",
bb->ob_type->tp_name);
return NULL;
}
#define b ((arrayobject *)bb)
@ -613,7 +615,9 @@ array_ass_slice(a, ilow, ihigh, v)
}
}
else {
PyErr_BadArgument();
PyErr_Format(PyExc_TypeError,
"can only assign array (not \"%.200s\") to array slice",
v->ob_type->tp_name);
return -1;
}
if (ilow < 0)
@ -821,7 +825,8 @@ array_reverse(self, args)
char tmp[sizeof(double)]; /* Assume that's the max item size */
if (args != NULL) {
PyErr_BadArgument();
PyErr_SetString(PyExc_TypeError,
"<array>.reverse requires exactly 0 arguments");
return NULL;
}

7
Modules/posixmodule.c
View File

@ -1562,8 +1562,7 @@ posix_spawnv(self, args)
getitem = PyTuple_GetItem;
}
else {
badarg:
PyErr_BadArgument();
PyErr_SetString(PyExc_TypeError, "argv must be tuple or list");
return NULL;
}
@ -1573,7 +1572,9 @@ posix_spawnv(self, args)
for (i = 0; i < argc; i++) {
if (!PyArg_Parse((*getitem)(argv, i), "s", &argvlist[i])) {
PyMem_DEL(argvlist);
goto badarg;
PyErr_SetString(PyExc_TypeError,
"all arguments must be strings");
return NULL;
}
}
argvlist[argc] = NULL;

3
Modules/structmodule.c
View File

@ -1128,7 +1128,8 @@ struct_pack(self, args)
if (args == NULL || !PyTuple_Check(args) ||
(n = PyTuple_Size(args)) < 1)
{
PyErr_BadArgument();
PyErr_SetString(PyExc_TypeError,
"struct.pack requires at least one argument");
return NULL;
}
format = PyTuple_GetItem(args, 0);