Kaydet (Commit) 004e03fb authored tarafından Serhiy Storchaka's avatar Serhiy Storchaka Kaydeden (comit) GitHub

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

üst 80ec8364
...@@ -11282,7 +11282,16 @@ PyUnicode_Concat(PyObject *left, PyObject *right) ...@@ -11282,7 +11282,16 @@ PyUnicode_Concat(PyObject *left, PyObject *right)
Py_UCS4 maxchar, maxchar2; Py_UCS4 maxchar, maxchar2;
Py_ssize_t left_len, right_len, new_len; 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; return NULL;
/* Shortcuts */ /* Shortcuts */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment