mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
This commit is contained in:
Guido van Rossum 1995-01-21 14:09:37 +00:00
parent 9aa3d1370e
commit 64fc649095
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/getargs.c
View file

@ -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 **);