mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#14897: Enhance error messages of struct.pack and struct.pack_into

Browse source 
Patch by Matti Mäki.
This commit is contained in:
Petri Lehtinen 2012-10-29 21:16:57 +02:00
parent 64c0b2ca3d
commit 5c89c19eae
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/_struct.c
View file

@ -1603,7 +1603,7 @@ s_pack(PyObject *self, PyObject *args)
if (PyTuple_GET_SIZE(args) != soself->s_len)
{
PyErr_Format(StructError,
"pack requires exactly %zd arguments", soself->s_len);
"pack expected %zd items for packing (got %zd)", soself->s_len, PyTuple_GET_SIZE(args));
return NULL;
}
@ -1642,9 +1642,19 @@ s_pack_into(PyObject *self, PyObject *args)
assert(soself->s_codes != NULL);
if (PyTuple_GET_SIZE(args) != (soself->s_len + 2))
{
PyErr_Format(StructError,
"pack_into requires exactly %zd arguments",
(soself->s_len + 2));
if (PyTuple_GET_SIZE(args) == 0) {
PyErr_Format(StructError,
"pack_into expected buffer argument");
}
else if (PyTuple_GET_SIZE(args) == 1) {
PyErr_Format(StructError,
"pack_into expected offset argument");
}
else {
PyErr_Format(StructError,
"pack_into expected %zd items for packing (got %zd)",
soself->s_len, (PyTuple_GET_SIZE(args) - 2));
}
return NULL;
}