Skip to content

C
cpython
Kaydet (Commit) 262e1241 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

print class name for exceptions that are classes

üst 9e89f0a5
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 2 deletions
Python/pythonrun.c
Dosyayı görüntüle @ 262e1241
...@@ -62,6 +62,8 @@ static object *run_err_node PROTO((node *n, char *filename, ...@@ -62,6 +62,8 @@ static object *run_err_node PROTO((node *n, char *filename,
object *globals, object *locals)); object *globals, object *locals));
static object *run_node PROTO((node *n, char *filename, static object *run_node PROTO((node *n, char *filename,
object *globals, object *locals)); object *globals, object *locals));
static object *run_pyc_file PROTO((FILE *fp, char *filename,
object *globals, object *locals));
static void err_input PROTO((perrdetail *)); static void err_input PROTO((perrdetail *));
static void initsigs PROTO((void)); static void initsigs PROTO((void));
...@@ -348,8 +350,18 @@ print_error() ...@@ -348,8 +350,18 @@ print_error()
v = message; v = message;
} }
} }
if (writeobject(exception, f, PRINT_RAW) != 0) if (is_classobject(exception)) {
err_clear(); object* className = ((classobject*)exception)->cl_name;
if (className == NULL)
writestring("<unknown>", f);
else {
if (writeobject(className, f, PRINT_RAW) != 0)
err_clear();
}
} else {
if (writeobject(exception, f, PRINT_RAW) != 0)
err_clear();
}
if (v != NULL && v != None) { if (v != NULL && v != None) {
writestring(": ", f); writestring(": ", f);
if (writeobject(v, f, PRINT_RAW) != 0) if (writeobject(v, f, PRINT_RAW) != 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment