mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 01:05:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* stdwinmodule.c: various new commands: setwin{pos,size},

Browse source 
listfontnames, bitmap ops.
* listobject.c: use mkvalue() when possible; avoid weird error when
  calling append() without args.
* modsupport.c: new feature in getargs(): if the format string
  contains a semicolor the string after that is used as the error
  message instead of "bad argument list (format %s)" when there's an
  error.
This commit is contained in:
Guido van Rossum 1993-02-08 15:49:17 +00:00
parent 3f2ef09f40
commit bf80e5407f
3 changed files with 301 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Python/modsupport.c
View file

@ -70,7 +70,7 @@ initmodule(name, methods)
}
/* Helper for getargs() and mkvalue() to scan the length of a format */
/* Helper for mkvalue() to scan the length of a format */
static int countformat PROTO((char *format, int endchar));
static int countformat(format, endchar)
@ -292,24 +292,34 @@ int getargs(va_alist) va_dcl
arg = va_arg(va, object *);
format = va_arg(va, char *);
#endif
if (*format == '\0') {
if (*format == '\0' || *format == ';') {
va_end(va);
if (arg != NULL) {
err_setstr(TypeError, "no arguments needed");
char *str = "no arguments needed";
if (*format == ';')
str = format+1;
err_setstr(TypeError, str);
return 0;
}
return 1;
}
f = format;
ok = do_arg(arg, &f, &va) && *f == '\0';
ok = do_arg(arg, &f, &va) && (*f == '\0' || *f == ';');
va_end(va);
if (!ok) {
char buf[256];
if (!err_occurred()) {
sprintf(buf, "bad argument list (format '%s')",
format);
err_setstr(TypeError, buf);
char buf[256];
char *str;
f = strchr(format, ';');
if (f != NULL)
str = f+1;
else {
sprintf(buf, "bad argument list (format '%s')",
format);
str = buf;
}
err_setstr(TypeError, str);
}
}
return ok;