bpo-29116: Improve error message for concatenating str with non-str. (python#710)

serhiy-storchaka · web-flow · commit 004e03fb0c2f · 2017-03-19T19:38:42.000+02:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -11282,7 +11282,16 @@ PyUnicode_Concat(PyObject *left, PyObject *right)
     Py_UCS4 maxchar, maxchar2;
     Py_ssize_t left_len, right_len, new_len;
 
-    if (ensure_unicode(left) < 0 || ensure_unicode(right) < 0)
+    if (ensure_unicode(left) < 0)
+        return NULL;
+
+    if (!PyUnicode_Check(right)) {
+        PyErr_Format(PyExc_TypeError,
+                     "can only concatenate str (not \"%.200s\") to str",
+                     right->ob_type->tp_name);
+        return NULL;
+    }
+    if (PyUnicode_READY(right) < 0)
         return NULL;
 
     /* Shortcuts */
