Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 2366:94bf2f05da31 legacy-trunk
fix bug in try-finally with class exceptions; declare different func pointers for different uses
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Fri, 17 Feb 1995 15:04:21 +0000 |
| parents | 4c2f1452125d |
| children | 4dd1af0ddef0 |
line wrap: on
line diff
--- a/Python/ceval.c Fri Feb 17 15:01:39 1995 +0000 +++ b/Python/ceval.c Fri Feb 17 15:04:21 1995 +0000 @@ -874,7 +874,7 @@ if (why == WHY_RETURN) retval = POP(); } - else if (is_stringobject(v)) { + else if (is_stringobject(v) || is_classobject(v)) { w = POP(); err_setval(v, w); DECREF(w); @@ -2357,13 +2357,14 @@ typeobject *tp = w->ob_type; sequence_methods *sq; mapping_methods *mp; - int (*func)(); + int (*func1)(); + int (*func2)(); if ((mp = tp->tp_as_mapping) != NULL && - (func = mp->mp_ass_subscript) != NULL) { - return (*func)(w, key, v); + (func1 = mp->mp_ass_subscript) != NULL) { + return (*func1)(w, key, v); } else if ((sq = tp->tp_as_sequence) != NULL && - (func = sq->sq_ass_item) != NULL) { + (func2 = sq->sq_ass_item) != NULL) { if (!is_intobject(key)) { err_setstr(TypeError, "sequence subscript must be integer (assign or del)"); @@ -2377,7 +2378,7 @@ return -1; i += len; } - return (*func)(w, i, v); + return (*func2)(w, i, v); } } else {