| commit | 64fc64909524bc2a2dc351228dfdf1c2958ed7d1 | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Sat Jan 21 14:09:37 1995 +0000 |
| committer | Guido van Rossum <guido@python.org> | Sat Jan 21 14:09:37 1995 +0000 |
| tree | 971711df46401d603f826ee199c9c6b4065cdfc4 | |
| parent | 9aa3d1370eafa5f5a62eba73585ea6932b169821 [diff] [blame] |
don't overwrite error already set (e.g. from O&)
diff --git a/Python/getargs.c b/Python/getargs.c index 68bfd0e..cd3ff6d 100644 --- a/Python/getargs.c +++ b/Python/getargs.c
@@ -259,6 +259,8 @@ int i; char *p = buf; + if (err_occurred()) + return; if (iarg == 0 && message == NULL) message = msg; else if (message == NULL) { @@ -583,7 +585,7 @@ void *addr = va_arg(*p_va, void *); format++; if (! (*convert)(arg, addr)) - return ""; + return "(unspecified)"; } else { p = va_arg(*p_va, object **);