Merge alpha100 branch back to main trunk

This commit is contained in:
Guido van Rossum 1994-08-01 11:34:53 +00:00
parent 2979b01ff8
commit b6775db241
176 changed files with 5302 additions and 3668 deletions

View file

@ -106,6 +106,19 @@ signal_handler(sig_num)
}
static object *
signal_alarm(self, args)
object *self; /* Not used */
object *args;
{
int t;
if (!getargs(args, "i", &t))
return NULL;
alarm(t);
INCREF(None);
return None;
}
static object *
signal_signal(self, args)
object *self; /* Not used */
@ -173,6 +186,7 @@ signal_getsignal(self, args)
/* List of functions defined in the module */
static struct methodlist signal_methods[] = {
{"alarm", signal_alarm},
{"signal", signal_signal},
{"getsignal", signal_getsignal},
{NULL, NULL} /* sentinel */