diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-03-19 19:06:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 19:06:29 (GMT) |
| commit | 3d258b1eb453bcbc412d6b252f5bdceae0303f07 (patch) | |
| tree | df8f6687638c4b7bba9289abbf406d2c49c88577 /Objects/bytesobject.c | |
| parent | da88596a19d2cad0e85a2b3c3290b5b1d97a793d (diff) | |
| download | cpython-3d258b1eb453bcbc412d6b252f5bdceae0303f07.zip cpython-3d258b1eb453bcbc412d6b252f5bdceae0303f07.tar.gz cpython-3d258b1eb453bcbc412d6b252f5bdceae0303f07.tar.bz2 | |
bpo-29116: Fix error messages for concatenating bytes and bytearray with unsupported type. (#709) (#723)
(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 30c1a7e..c95a46d 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -1438,7 +1438,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; } |