diff options
| author | Guido van Rossum <guido@python.org> | 1995-01-21 14:09:37 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1995-01-21 14:09:37 (GMT) |
| commit | 64fc64909524bc2a2dc351228dfdf1c2958ed7d1 (patch) | |
| tree | 971711df46401d603f826ee199c9c6b4065cdfc4 | |
| parent | 9aa3d1370eafa5f5a62eba73585ea6932b169821 (diff) | |
| download | cpython-64fc64909524bc2a2dc351228dfdf1c2958ed7d1.zip cpython-64fc64909524bc2a2dc351228dfdf1c2958ed7d1.tar.gz cpython-64fc64909524bc2a2dc351228dfdf1c2958ed7d1.tar.bz2 | |
don't overwrite error already set (e.g. from O&)
| -rw-r--r-- | Python/getargs.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ seterror(iarg, msg, levels, fname, message) int i; char *p = buf; + if (err_occurred()) + return; if (iarg == 0 && message == NULL) message = msg; else if (message == NULL) { @@ -583,7 +585,7 @@ convertsimple1(arg, p_format, p_va) void *addr = va_arg(*p_va, void *); format++; if (! (*convert)(arg, addr)) - return ""; + return "(unspecified)"; } else { p = va_arg(*p_va, object **); |