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

Rename struct.unpack() 2nd parameter to "buffer"

Browse source 
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.
This commit is contained in:
Victor Stinner 2017-02-02 14:24:16 +01:00
parent a0e454b69d
commit c0f59ad145
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_struct.c
View file

@ -2162,7 +2162,7 @@ pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
unpack
format: object
inputstr: object
buffer: Py_buffer
/
Return a tuple containing values unpacked according to the format string.
@ -2173,8 +2173,8 @@ See help(struct) for more on format strings.
[clinic start generated code]*/
static PyObject *
unpack_impl(PyObject *module, PyObject *format, PyObject *inputstr)
/*[clinic end generated code: output=06951d66eae6d63b input=4b81d54988890f5e]*/
unpack_impl(PyObject *module, PyObject *format, Py_buffer *buffer)
/*[clinic end generated code: output=f75ada02aaa33b3b input=654078e6660c2df0]*/
{
PyStructObject *s_object;
PyObject *result;
@ -2182,7 +2182,7 @@ unpack_impl(PyObject *module, PyObject *format, PyObject *inputstr)
s_object = cache_struct(format);
if (s_object == NULL)
return NULL;
result = Struct_unpack(s_object, inputstr);
result = Struct_unpack_impl(s_object, buffer);
Py_DECREF(s_object);
return result;
}