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

serhiy-storchaka · web-flow · commit 3d258b1eb453 · 2017-03-19T21:06:29.000+02:00
(cherry picked from commit 6b5a9ec)
diff --git 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
@@ -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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ PyByteArray_Concat(PyObject a, PyObject b)`
`254`	`254`	`if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 \|\|`
`255`	`255`	`PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) {`
`256`	`256`	`PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",`
`257`		`- Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name);`
	`257`	`+ Py_TYPE(b)->tp_name, Py_TYPE(a)->tp_name);`
`258`	`258`	`goto done;`
`259`	`259`	`}`
`260`	`260`
Original file line number	Diff line number	Diff line change
`@@ -1438,7 +1438,7 @@ bytes_concat(PyObject a, PyObject b)`
`1438`	`1438`	`if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 \|\|`
`1439`	`1439`	`PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) {`
`1440`	`1440`	`PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",`
`1441`		`- Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name);`
	`1441`	`+ Py_TYPE(b)->tp_name, Py_TYPE(a)->tp_name);`
`1442`	`1442`	`goto done;`
`1443`	`1443`	`}`
`1444`	`1444`