Mercurial > cpython-lru_cache-weakref
diff Python/getargs.c @ 2210:e734c7235727 legacy-trunk
don't overwrite error already set (e.g. from O&)
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Sat, 21 Jan 1995 14:09:37 +0000 |
| parents | d0d0a69b5ca3 |
| children | 6098aaa8ae7f |
line wrap: on
line diff
--- a/Python/getargs.c Sat Jan 21 13:46:04 1995 +0000 +++ b/Python/getargs.c Sat Jan 21 14:09:37 1995 +0000 @@ -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 **);