diff options
| author | Michael W. Hudson <mwh@python.net> | 2002-03-11 10:11:46 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2002-03-11 10:11:46 (GMT) |
| commit | 244ca00bf084d17d8d1364458cfcd8b4ece4837e (patch) | |
| tree | 3e1b6b385ac749a8f8f1230e55ad9b4b9b9255b3 | |
| parent | 7ac030322ffa51990f5804531ed7ae6a6b6e38c4 (diff) | |
| download | cpython-244ca00bf084d17d8d1364458cfcd8b4ece4837e.zip cpython-244ca00bf084d17d8d1364458cfcd8b4ece4837e.tar.gz cpython-244ca00bf084d17d8d1364458cfcd8b4ece4837e.tar.bz2 | |
backport jhylton's checkin of
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.
| -rw-r--r-- | Objects/abstract.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 2acfd08..2207602 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -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'", |