Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-30246: fix several error messages which only mention bytes in struct (#1421)

This commit is contained in:
Xiang Zhang 2017-09-14 10:33:26 +08:00 committed by GitHub
parent 1b8f612e18
commit c3e97d9d98
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/_struct.c
View File

@ -1453,7 +1453,8 @@ Struct___init___impl(PyStructObject *self, PyObject *format)
if (!PyBytes_Check(format)) {
Py_DECREF(format);
PyErr_Format(PyExc_TypeError,
"Struct() argument 1 must be a bytes object, not %.200s",
"Struct() argument 1 must be a str or bytes object, "
"not %.200s",
Py_TYPE(format)->tp_name);
return -1;
}
@ -1535,7 +1536,7 @@ Struct_unpack_impl(PyStructObject *self, Py_buffer *buffer)
assert(self->s_codes != NULL);
if (buffer->len != self->s_size) {
PyErr_Format(StructError,
"unpack requires a bytes object of length %zd",
"unpack requires a buffer of %zd bytes",
self->s_size);
return NULL;
}
@ -1708,8 +1709,8 @@ Struct_iter_unpack(PyStructObject *self, PyObject *buffer)
}
if (iter->buf.len % self->s_size != 0) {
PyErr_Format(StructError,
"iterative unpacking requires a bytes length "
"multiple of %zd",
"iterative unpacking requires a buffer of "
"a multiple of %zd bytes",
self->s_size);
Py_DECREF(iter);
return NULL;