commit 92c28cace45261ae06c5361aef661a01f58a5413
author Petri Lehtinen <petri@digip.org> Mon Oct 29 21:16:57 2012 +0200
committer Petri Lehtinen <petri@digip.org> Mon Oct 29 21:24:07 2012 +0200
tree 3b35c7ba419651bd5531c83124c5f90b42e5ce7e
parent 1b863ebfc8376700d571102d7ff0017ff1ef5b4e

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

Patch by Matti Mäki.

Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 558d24b..edbe9b9 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1575,7 +1575,7 @@
     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;
     }
 
@@ -1614,9 +1614,19 @@
     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;
     }