diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 24 | ||||
| -rw-r--r-- | Python/pythonrun.c | 2 |
2 files changed, 1 insertions, 25 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 935ce527b1..44239e6c6f 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -58,7 +58,6 @@ static int prtrace PROTO((object *, char *)); static void call_exc_trace PROTO((object **, object**, frameobject *)); static int call_trace PROTO((object **, object **, frameobject *, char *, object *)); -static int testbool PROTO((object *)); static object *add PROTO((object *, object *)); static object *sub PROTO((object *, object *)); static object *mul PROTO((object *, object *)); @@ -1612,29 +1611,6 @@ flushline() } -/* Test a value used as condition, e.g., in a for or if statement. - Return -1 if an error occurred */ - -static int -testbool(v) - object *v; -{ - int res; - if (v == None) - res = 0; - else if (v->ob_type->tp_as_number != NULL) - res = (*v->ob_type->tp_as_number->nb_nonzero)(v); - else if (v->ob_type->tp_as_mapping != NULL) - res = (*v->ob_type->tp_as_mapping->mp_length)(v); - else if (v->ob_type->tp_as_sequence != NULL) - res = (*v->ob_type->tp_as_sequence->sq_length)(v); - else - res = 1; - if (res > 0) - res = 1; - return res; -} - static object * or(v, w) object *v, *w; diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 98008b4b9b..3898d13af2 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -245,6 +245,7 @@ print_error() if (f == NULL) fprintf(stderr, "lost sys.stderr\n"); else { + printtraceback(f); if (writeobject(exception, f, PRINT_RAW) != 0) err_clear(); if (v != NULL && v != None) { @@ -253,7 +254,6 @@ print_error() err_clear(); } writestring("\n", f); - printtraceback(f); } XDECREF(exception); XDECREF(v); |