mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

#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:25:01 +02:00
commit 4648b4779a
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -820,6 +820,7 @@ Michael Muller
Neil Muller Neil Muller
Louis Munro Louis Munro
R. David Murray R. David Murray
Matti Mäki
Dale Nagata Dale Nagata
John Nagle John Nagle
Takahiro Nakayama Takahiro Nakayama

3
Misc/NEWS
View file

@ -49,6 +49,9 @@ Core and Builtins
Library Library
------- -------
- Issue #14897: Enhance error messages of struct.pack and
struct.pack_into. Patch by Matti Mäki.
- Issue #12890: cgitb no longer prints spurious <p> tags in text - Issue #12890: cgitb no longer prints spurious <p> tags in text
mode when the logdir option is specified. mode when the logdir option is specified.

18
Modules/_struct.c
View file

@ -1662,7 +1662,7 @@ s_pack(PyObject *self, PyObject *args)
if (PyTuple_GET_SIZE(args) != soself->s_len) if (PyTuple_GET_SIZE(args) != soself->s_len)
{ {
PyErr_Format(StructError, 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; return NULL;
} }
@ -1701,9 +1701,19 @@ s_pack_into(PyObject *self, PyObject *args)
assert(soself->s_codes != NULL); assert(soself->s_codes != NULL);
if (PyTuple_GET_SIZE(args) != (soself->s_len + 2)) if (PyTuple_GET_SIZE(args) != (soself->s_len + 2))
{ {
PyErr_Format(StructError, if (PyTuple_GET_SIZE(args) == 0) {
"pack_into requires exactly %zd arguments", PyErr_Format(StructError,
(soself->s_len + 2)); "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; return NULL;
} }