summaryrefslogtreecommitdiffstats
path: root/Python/ceval.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-02-17 15:04:21 (GMT)
committerGuido van Rossum <guido@python.org>1995-02-17 15:04:21 (GMT)
commit1d339e8c35963ad2f445b9ec779604ddb6957bb4 (patch)
tree9e1555248544ee00c75147d4a4b490bc02f984d6 /Python/ceval.c
parentfe299f9408ab3e3c9260a68cd0000fa88b46a143 (diff)
downloadcpython-1d339e8c35963ad2f445b9ec779604ddb6957bb4.zip
cpython-1d339e8c35963ad2f445b9ec779604ddb6957bb4.tar.gz
cpython-1d339e8c35963ad2f445b9ec779604ddb6957bb4.tar.bz2
fix bug in try-finally with class exceptions; declare different func pointers for different uses
Diffstat (limited to 'Python/ceval.c')
-rw-r--r--Python/ceval.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index cb9bb8a..22f026e 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -874,7 +874,7 @@ eval_code(co, globals, locals, owner, arg)
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 @@ assign_subscript(w, key, v) /* w[key] = v */
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 @@ assign_subscript(w, key, v) /* w[key] = v */
return -1;
i += len;
}
- return (*func)(w, i, v);
+ return (*func2)(w, i, v);
}
}
else {