Commit 6ae6a43a authored by Jeremy Hylton's avatar Jeremy Hylton

Fix for SF bug 516727: MyInt(2) + "3" -> NotImplemented

PyNumber_Add() tries the nb_add slot first, then falls back to
sq_concat.  However, tt didn't check the return value of sq_concat.
If sq_concat returns NotImplemented, raise the standard TypeError.
parent 8acf1e0e
......@@ -605,11 +605,10 @@ PyNumber_Add(PyObject *v, PyObject *w)
PyObject *result = binary_op1(v, w, NB_SLOT(nb_add));
if (result == Py_NotImplemented) {
PySequenceMethods *m = v->ob_type->tp_as_sequence;
Py_DECREF(Py_NotImplemented);
if (m && m->sq_concat) {
Py_DECREF(result);
if (m && m->sq_concat)
result = (*m->sq_concat)(v, w);
}
else {
if (result == Py_NotImplemented) {
PyErr_Format(
PyExc_TypeError,
"unsupported operand types for +: '%s' and '%s'",
......
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