ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

backport jhylton's checkin of

Browse Source 
revision 2.97 of abstract.c

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

PyNumber_Add() tries the nb_add slot first, then falls back to
sq_concat.  However, it didn't check the return value of sq_concat.
If sq_concat returns NotImplemented, raise the standard TypeError.
This commit is contained in:
Michael W. Hudson
2002-03-11 10:11:46 +00:00
parent 7ac030322f
commit 244ca00bf0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Objects/abstract.c
View File

@@ -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'",