]> granicus.if.org Git - python/commitdiff
bpo-29116: Fix error messages for concatenating bytes and bytearray with unsupported...
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 19 Mar 2017 17:47:02 +0000 (19:47 +0200)
committerGitHub <noreply@github.com>
Sun, 19 Mar 2017 17:47:02 +0000 (19:47 +0200)
Objects/bytearrayobject.c
Objects/bytesobject.c

index 3a80b73e0be4fca2d5bdb1324a537f97aab81feb..fe322d22b8632805df834bc3118cf39ac9383610 100644 (file)
@@ -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;
     }
 
index 1050a93e6e46f1984ceb608fc26c4410102a3fc9..bde7948c109ceaabb201722ace2f062e83f25f16 100644 (file)
@@ -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;
     }