mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +00:00
Lots of changes, most minor (fatal() instead of abort(), use of
err_fetch/err_restore and so on). But... NOTE: import.c has been rewritten and all the DL stuff is now in the new file importdl.c.
This commit is contained in:
parent
824de25fe2
commit
1ae940a587
15 changed files with 1871 additions and 1089 deletions
|
@ -242,12 +242,10 @@ run_command(command)
|
|||
void
|
||||
print_error()
|
||||
{
|
||||
object *exception, *v, *f;
|
||||
err_get(&exception, &v);
|
||||
if (exception == NULL) {
|
||||
fprintf(stderr, "print_error called but no exception\n");
|
||||
abort();
|
||||
}
|
||||
object *exception, *v, *tb, *f;
|
||||
err_fetch(&exception, &v, &tb);
|
||||
if (exception == NULL)
|
||||
fatal("print_error called but no exception");
|
||||
if (exception == SystemExit) {
|
||||
if (v == NULL || v == None)
|
||||
goaway(0);
|
||||
|
@ -262,11 +260,12 @@ print_error()
|
|||
}
|
||||
sysset("last_type", exception);
|
||||
sysset("last_value", v);
|
||||
sysset("last_traceback", tb);
|
||||
f = sysget("stderr");
|
||||
if (f == NULL)
|
||||
fprintf(stderr, "lost sys.stderr\n");
|
||||
else {
|
||||
printtraceback(f);
|
||||
tb_print(tb, f);
|
||||
if (exception == SyntaxError) {
|
||||
object *message;
|
||||
char *filename, *text;
|
||||
|
@ -331,6 +330,7 @@ print_error()
|
|||
}
|
||||
XDECREF(exception);
|
||||
XDECREF(v);
|
||||
XDECREF(tb);
|
||||
}
|
||||
|
||||
object *
|
||||
|
@ -421,7 +421,6 @@ compile_string(str, filename, start)
|
|||
int start;
|
||||
{
|
||||
node *n;
|
||||
int err;
|
||||
codeobject *co;
|
||||
n = parse_string(str, start);
|
||||
if (n == NULL)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue