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

diff --git a/Python/getargs.c b/Python/getargs.c
index 68bfd0e53190730c09c1366c3e8328e807c3576e..cd3ff6d4d8c1f2cd037f20b7c38213fd1c95f2b9 100644 (file)
--- 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 **);