bpo-29116: Fix error messages for concatenating bytes and bytearray with unsupported...

(cherry picked from commit 6b5a9ec4788770c652bac3bf5d5a0a3b710b82ae)

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 3fad6d80b59e5a717b8a4cb55c76de52ea27cdf5..5132eba52bf5ac41a89ecb05c3ca200937913568 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -254,7 +254,7 @@ PyByteArray_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;
     }
 

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 673bb00b984370dadf8cd5f7367b1619ab97d96b..8ede5f0c599671caa204ef134cd0e7af08bf3456 100644 (file)
--- 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;
     }