From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 19 Mar 2017 19:06:29 +0000 (+0200)
Subject: bpo-29116: Fix error messages for concatenating bytes and bytearray with unsupported... 
X-Git-Tag: v3.6.2rc1~301
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d258b1eb453bcbc412d6b252f5bdceae0303f07;p=python

bpo-29116: Fix error messages for concatenating bytes and bytearray with unsupported type. (#709) (#723)

(cherry picked from commit 6b5a9ec4788770c652bac3bf5d5a0a3b710b82ae)
---

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index a8d6980250..d456678d46 100644
--- 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 30c1a7e245..c95a46d184 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;
     }