Kaydet (Commit) 64fc6490 authored tarafından Guido van Rossum's avatar Guido van Rossum

don't overwrite error already set (e.g. from O&)

üst 9aa3d137
...@@ -259,6 +259,8 @@ seterror(iarg, msg, levels, fname, message) ...@@ -259,6 +259,8 @@ seterror(iarg, msg, levels, fname, message)
int i; int i;
char *p = buf; char *p = buf;
if (err_occurred())
return;
if (iarg == 0 && message == NULL) if (iarg == 0 && message == NULL)
message = msg; message = msg;
else if (message == NULL) { else if (message == NULL) {
...@@ -583,7 +585,7 @@ convertsimple1(arg, p_format, p_va) ...@@ -583,7 +585,7 @@ convertsimple1(arg, p_format, p_va)
void *addr = va_arg(*p_va, void *); void *addr = va_arg(*p_va, void *);
format++; format++;
if (! (*convert)(arg, addr)) if (! (*convert)(arg, addr))
return ""; return "(unspecified)";
} }
else { else {
p = va_arg(*p_va, object **); p = va_arg(*p_va, object **);
......
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