diff options
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_struct.c | 18 |
3 files changed, 18 insertions, 4 deletions
@@ -820,6 +820,7 @@ Michael Muller Neil Muller Louis Munro R. David Murray +Matti Mäki Dale Nagata John Nagle Takahiro Nakayama @@ -62,6 +62,9 @@ Core and Builtins Library ------- +- Issue #14897: Enhance error messages of struct.pack and + struct.pack_into. Patch by Matti Mäki. + - Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. Patch by Serhiy Storchaka. diff --git a/Modules/_struct.c b/Modules/_struct.c index 0f50144..6e8759b 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1661,7 +1661,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; } @@ -1700,9 +1700,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; } |