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

Wed Sep 13 23:22:26 EDT 2017

https://github.com/python/cpython/commit/fa82dda1012b406a7091587fc65384ce11528346
commit: fa82dda1012b406a7091587fc65384ce11528346
branch: 3.6
author: Xiang Zhang <angwerzx at 126.com>
committer: GitHub <noreply at github.com>
date: 2017年09月14日T11:22:23+08:00
summary:
[3.6] bpo-30246: fix several error messages which only mention bytes in struct (#3561)
files:
M Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index e9af6efa2ea..cd3fa2d1506 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1460,7 +1460,8 @@ s_init(PyObject *self, PyObject *args, PyObject *kwds)
 if (!PyBytes_Check(o_format)) {
 Py_DECREF(o_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(o_format)->tp_name);
 return -1;
 }
@@ -1541,7 +1542,7 @@ s_unpack(PyObject *self, PyObject *input)
 return NULL;
 if (vbuf.len != soself->s_size) {
 PyErr_Format(StructError,
- "unpack requires a bytes object of length %zd",
+ "unpack requires a buffer of %zd bytes",
 soself->s_size);
 PyBuffer_Release(&vbuf);
 return NULL;
@@ -1718,8 +1719,8 @@ s_iter_unpack(PyObject *_so, PyObject *input)
 }
 if (self->buf.len % so->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",
 so->s_size);
 Py_DECREF(self);
 return NULL;
