Rename struct.unpack() 2nd parameter to "buffer"
Issue #29300: Rename struct.unpack() second parameter from "inputstr" to
"buffer", and use the Py_buffer type.
Fix also unit tests on struct.unpack() which passed a Unicode string instead of
a bytes string as struct.unpack() second parameter. The purpose of
test_trailing_counter() is to test invalid format strings, not to test the
buffer parameter.
diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h
index f05ea53..f9c3a5c 100644
--- a/Modules/clinic/_struct.c.h
+++ b/Modules/clinic/_struct.c.h
@@ -156,7 +156,7 @@
{"calcsize", (PyCFunction)calcsize, METH_O, calcsize__doc__},
PyDoc_STRVAR(unpack__doc__,
-"unpack($module, format, inputstr, /)\n"
+"unpack($module, format, buffer, /)\n"
"--\n"
"\n"
"Return a tuple containing values unpacked according to the format string.\n"
@@ -169,27 +169,31 @@
{"unpack", (PyCFunction)unpack, METH_FASTCALL, unpack__doc__},
static PyObject *
-unpack_impl(PyObject *module, PyObject *format, PyObject *inputstr);
+unpack_impl(PyObject *module, PyObject *format, Py_buffer *buffer);
static PyObject *
unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
{
PyObject *return_value = NULL;
PyObject *format;
- PyObject *inputstr;
+ Py_buffer buffer = {NULL, NULL};
- if (!_PyArg_UnpackStack(args, nargs, "unpack",
- 2, 2,
- &format, &inputstr)) {
+ if (!_PyArg_ParseStack(args, nargs, "Oy*:unpack",
+ &format, &buffer)) {
goto exit;
}
if (!_PyArg_NoStackKeywords("unpack", kwnames)) {
goto exit;
}
- return_value = unpack_impl(module, format, inputstr);
+ return_value = unpack_impl(module, format, &buffer);
exit:
+ /* Cleanup for buffer */
+ if (buffer.obj) {
+ PyBuffer_Release(&buffer);
+ }
+
return return_value;
}
@@ -273,4 +277,4 @@
exit:
return return_value;
}
-/*[clinic end generated code: output=db8152ad222fa3d0 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0714090a5d0ea8ce input=a9049054013a1b77]*/