diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-03-19 19:06:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 19:06:44 (GMT) |
| commit | 2c5b2c3832d4d2af7b60333a5a8f73dd51ef6245 (patch) | |
| tree | 10db84532db60b05dca0395c0f7aa1327bbdd057 /Objects/bytesobject.c | |
| parent | 88b32eb7b317dd7c7943433f980e17e34e50f8f8 (diff) | |
| download | cpython-2c5b2c3832d4d2af7b60333a5a8f73dd51ef6245.zip cpython-2c5b2c3832d4d2af7b60333a5a8f73dd51ef6245.tar.gz cpython-2c5b2c3832d4d2af7b60333a5a8f73dd51ef6245.tar.bz2 | |
bpo-29116: Fix error messages for concatenating bytes and bytearray with unsupported type. (#709) (#724)
(cherry picked from commit 6b5a9ec4788770c652bac3bf5d5a0a3b710b82ae)
Diffstat (limited to 'Objects/bytesobject.c')
| -rw-r--r-- | Objects/bytesobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 673bb00..8ede5f0 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -1272,7 +1272,7 @@ bytes_concat(PyObject *a, PyObject *b) if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 || PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) { PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s", - Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name); + Py_TYPE(b)->tp_name, Py_TYPE(a)->tp_name); goto done; } |