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

Wed Sep 13 22:33:29 EDT 2017

https://github.com/python/cpython/commit/c3e97d9d984130d1c2aceedc4dfcd603b3162688
commit: c3e97d9d984130d1c2aceedc4dfcd603b3162688
branch: master
author: Xiang Zhang <angwerzx at 126.com>
committer: GitHub <noreply at github.com>
date: 2017年09月14日T10:33:26+08:00
summary:
bpo-30246: fix several error messages which only mention bytes in struct (#1421)
files:
M Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 69a1e996d05..04d7f8e1871 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -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;
