[Python-checkins] CVS: python/dist/src/Modules _localemodule.c,2.6,2.7 _tkinter.c,1.89,1.90 almodule.c,1.22,1.23 audioop.c,1.34,1.35 binascii.c,2.18,2.19 bsddbmodule.c,1.16,1.17 cPickle.c,2.37,2.38 cStringIO.c,2.17,2.18 cdmodule.c,1.17,1.18 dbmmodule.c,2.15,2.16 fcntlmodule.c,2.18,2.19 gdbmmodule.c,2.20,2.21 md5module.c,2.13,2.14 newmodule.c,2.18,2.19 pcremodule.c,2.16,2.17 puremodule.c,2.1,2.2 readline.c,2.15,2.16 regexmodule.c,1.32,1.33 resource.c,2.9,2.10 rotormodule.c,2.21,2.22 selectmodule.c,2.30,2.31 shamodule.c,2.3,2.4 socketmodule.c,1.95,1.96 soundex.c,2.6,2.7 stropmodule.c,2.60,2.61 structmodule.c,2.29,2.30 syslogmodule.c,2.12,2.13 threadmodule.c,2.29,2.30 timemodule.c,2.78,2.79 xxmodule.c,2.14,2.15 zlibmodule.c,2.29,2.30

Guido van Rossum guido@cnri.reston.va.us
Tue, 29 Feb 2000 09:00:00 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	_localemodule.c _tkinter.c almodule.c audioop.c binascii.c 
	bsddbmodule.c cPickle.c cStringIO.c cdmodule.c dbmmodule.c 
	fcntlmodule.c gdbmmodule.c md5module.c newmodule.c 
	pcremodule.c puremodule.c readline.c regexmodule.c resource.c 
	rotormodule.c selectmodule.c shamodule.c socketmodule.c 
	soundex.c stropmodule.c structmodule.c syslogmodule.c 
	threadmodule.c timemodule.c xxmodule.c zlibmodule.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: _localemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** _localemodule.c	1998/12/04 18:49:34	2.6
--- _localemodule.c	2000/02/29 13:59:22	2.7
***************
*** 136,140 ****
    PyObject *result_object;
    struct lconv *lc;
!   if(!PyArg_ParseTuple(args,"i|z",&category,&locale))return 0;
    if(locale){
      /* set locale */
--- 136,140 ----
    PyObject *result_object;
    struct lconv *lc;
!   if(!PyArg_ParseTuple(args,"i|z:setlocale",&category,&locale))return 0;
    if(locale){
      /* set locale */
***************
*** 267,271 ****
  {
    char *s1,*s2;
!   if(!PyArg_ParseTuple(args,"ss",&s1,&s2))
       return NULL;
    return PyInt_FromLong(strcoll(s1,s2));
--- 267,271 ----
  {
    char *s1,*s2;
!   if(!PyArg_ParseTuple(args,"ss:strcoll",&s1,&s2))
       return NULL;
    return PyInt_FromLong(strcoll(s1,s2));
***************
*** 284,288 ****
    int n1,n2;
    PyObject *result;
!   if(!PyArg_ParseTuple(args,"s",&s))
       return NULL;
    /* assume no change in size, first */
--- 284,288 ----
    int n1,n2;
    PyObject *result;
!   if(!PyArg_ParseTuple(args,"s:strxfrm",&s))
       return NULL;
    /* assume no change in size, first */

Index: _tkinter.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** _tkinter.c	1999/11/05 18:09:56	1.89
--- _tkinter.c	2000/02/29 13:59:22	1.90
***************
*** 698,702 ****
  	int err;
    
! 	if (!PyArg_ParseTuple(args, "s", &script))
  		return NULL;
  
--- 698,702 ----
  	int err;
    
! 	if (!PyArg_ParseTuple(args, "s:eval", &script))
  		return NULL;
  
***************
*** 721,725 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &script))
  		return NULL;
  
--- 721,725 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:globaleval", &script))
  		return NULL;
  
***************
*** 744,748 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &fileName))
  		return NULL;
  
--- 744,748 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
  		return NULL;
  
***************
*** 789,793 ****
  	char *msg;
  
! 	if (!PyArg_ParseTuple(args, "s", &msg))
  		return NULL;
  	ENTER_TCL
--- 789,793 ----
  	char *msg;
  
! 	if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
  		return NULL;
  	ENTER_TCL
***************
*** 817,821 ****
  		return NULL;
  
! 	if (PyArg_ParseTuple(args, "sO", &name1, &newValue)) {
  		/* XXX Merge? */
  		s = AsString(newValue, tmp);
--- 817,821 ----
  		return NULL;
  
! 	if (PyArg_ParseTuple(args, "sO:setvar", &name1, &newValue)) {
  		/* XXX Merge? */
  		s = AsString(newValue, tmp);
***************
*** 826,830 ****
  	else {
  		PyErr_Clear();
! 		if (PyArg_ParseTuple(args, "ssO", &name1, &name2, &newValue)) {
  			s = AsString (newValue, tmp);
  			ENTER_TCL
--- 826,830 ----
  	else {
  		PyErr_Clear();
! 		if (PyArg_ParseTuple(args, "ssO:setvar", &name1, &name2, &newValue)) {
  			s = AsString (newValue, tmp);
  			ENTER_TCL
***************
*** 874,878 ****
  	PyObject *res = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &name1, &name2))
  		return NULL;
  	ENTER_TCL
--- 874,878 ----
  	PyObject *res = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|s:getvar", &name1, &name2))
  		return NULL;
  	ENTER_TCL
***************
*** 920,924 ****
  	int code;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &name1, &name2))
  		return NULL;
  	ENTER_TCL
--- 920,924 ----
  	int code;
  
! 	if (!PyArg_ParseTuple(args, "s|s:unsetvar", &name1, &name2))
  		return NULL;
  	ENTER_TCL
***************
*** 968,972 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 968,972 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:getint", &s))
  		return NULL;
  	if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 983,987 ****
  	double v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 983,987 ----
  	double v;
  
! 	if (!PyArg_ParseTuple(args, "s:getdouble", &s))
  		return NULL;
  	if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 998,1002 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 998,1002 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:getboolean", &s))
  		return NULL;
  	if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 1014,1018 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1014,1018 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s:exprstring", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1037,1041 ****
  	long v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1037,1041 ----
  	long v;
  
! 	if (!PyArg_ParseTuple(args, "s:exprlong", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1060,1064 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
--- 1060,1064 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
  		return NULL;
  	PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
***************
*** 1085,1089 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1085,1089 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1111,1115 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "s", &list))
  		return NULL;
  
--- 1111,1115 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "s:splitlist", &list))
  		return NULL;
  
***************
*** 1141,1145 ****
  	char *list;
  
! 	if (!PyArg_ParseTuple(args, "s", &list))
  		return NULL;
  	return Split(list);
--- 1141,1145 ----
  	char *list;
  
! 	if (!PyArg_ParseTuple(args, "s:split", &list))
  		return NULL;
  	return Split(list);
***************
*** 1262,1266 ****
  	Tcl_Command err;
  
! 	if (!PyArg_ParseTuple(args, "sO", &cmdName, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 1262,1266 ----
  	Tcl_Command err;
  
! 	if (!PyArg_ParseTuple(args, "sO:createcommand", &cmdName, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
***************
*** 1301,1305 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &cmdName))
  		return NULL;
  	ENTER_TCL
--- 1301,1305 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
  		return NULL;
  	ENTER_TCL
***************
*** 1444,1448 ****
  	FHANDLE tfile;
  
! 	if (!PyArg_ParseTuple(args, "OiO", &file, &mask, &func))
  		return NULL;
  	id = GetFileNo(file);
--- 1444,1448 ----
  	FHANDLE tfile;
  
! 	if (!PyArg_ParseTuple(args, "OiO:createfilehandler", &file, &mask, &func))
  		return NULL;
  	id = GetFileNo(file);
***************
*** 1477,1481 ****
  	FHANDLE tfile;
    
! 	if (!PyArg_ParseTuple(args, "O", &file))
  		return NULL;
  	id = GetFileNo(file);
--- 1477,1481 ----
  	FHANDLE tfile;
    
! 	if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
  		return NULL;
  	id = GetFileNo(file);
***************
*** 1514,1518 ****
  	PyObject *func = v->func;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (v->token != NULL) {
--- 1514,1518 ----
  	PyObject *func = v->func;
  
! 	if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
  		return NULL;
  	if (v->token != NULL) {
***************
*** 1647,1651 ****
  	TkttObject *v;
  
! 	if (!PyArg_ParseTuple(args, "iO", &milliseconds, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 1647,1651 ----
  	TkttObject *v;
  
! 	if (!PyArg_ParseTuple(args, "iO:createtimerhandler", &milliseconds, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
***************
*** 1673,1677 ****
  #endif
  
! 	if (!PyArg_ParseTuple(args, "|i", &threshold))
  		return NULL;
  
--- 1673,1677 ----
  #endif
  
! 	if (!PyArg_ParseTuple(args, "|i:mainloop", &threshold))
  		return NULL;
  
***************
*** 1722,1726 ****
  	int rv;
  
! 	if (!PyArg_ParseTuple(args, "|i", &flags))
  		return NULL;
  
--- 1722,1726 ----
  	int rv;
  
! 	if (!PyArg_ParseTuple(args, "|i:dooneevent", &flags))
  		return NULL;
  
***************
*** 1737,1741 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1737,1741 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":quit"))
  		return NULL;
  
***************
*** 1751,1755 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1751,1755 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":interpaddr"))
  		return NULL;
  
***************
*** 1863,1867 ****
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi",
  			      &screenName, &baseName, &className,
  			      &interactive))
--- 1863,1867 ----
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi:create",
  			      &screenName, &baseName, &className,
  			      &interactive))

Index: almodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/almodule.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** almodule.c	1999/12/10 15:12:11	1.22
--- almodule.c	2000/02/29 13:59:22	1.23
***************
*** 282,286 ****
  	int par;
  
! 	if (!PyArg_ParseTuple(args, "i", &par))
  		return NULL;
  
--- 282,286 ----
  	int par;
  
! 	if (!PyArg_ParseTuple(args, "i:SetConfig", &par))
  		return NULL;
  
***************
*** 300,304 ****
  	int par;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	
--- 300,304 ----
  	int par;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	
***************
*** 398,402 ****
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, "d", &maximum_value))
  		return NULL;
  	if (alSetFloatMax(self->config, maximum_value) < 0)
--- 398,402 ----
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, "d:SetFloatMax", &maximum_value))
  		return NULL;
  	if (alSetFloatMax(self->config, maximum_value) < 0)
***************
*** 418,422 ****
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((maximum_value = alGetFloatMax(self->config)) == 0)
--- 418,422 ----
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, ":GetFloatMax"))
  		return NULL;
  	if ((maximum_value = alGetFloatMax(self->config)) == 0)
***************
*** 487,491 ****
  	long par;
  
! 	if (!PyArg_ParseTuple(args, "l", &par))
  		return NULL;
  
--- 487,491 ----
  	long par;
  
! 	if (!PyArg_ParseTuple(args, "l:SetConfig", &par))
  		return NULL;
  
***************
*** 505,509 ****
  	long par;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	
--- 505,509 ----
  	long par;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	
***************
*** 587,591 ****
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return 0;
  	if ((arg = ALgetfloatmax(self->config)) == 0)
--- 587,591 ----
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, ":GetFloatMax"))
  		return 0;
  	if ((arg = ALgetfloatmax(self->config)) == 0)
***************
*** 601,605 ****
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, "d", &arg))
  		return 0;
  	if (ALsetfloatmax(self->config, arg) == -1)
--- 601,605 ----
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, "d:SetFloatMax", &arg))
  		return 0;
  	if (ALsetfloatmax(self->config, arg) == -1)
***************
*** 724,728 ****
  {
  	alcobject *config;
! 	if (!PyArg_ParseTuple(args, "O!", &Alctype, &config))
  		return NULL;
  	if (alSetConfig(self->port, config->config) < 0)
--- 724,728 ----
  {
  	alcobject *config;
! 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
  		return NULL;
  	if (alSetConfig(self->port, config->config) < 0)
***************
*** 743,747 ****
  {
  	ALconfig config;
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = alGetConfig(self->port)) == NULL)
--- 743,747 ----
  {
  	ALconfig config;
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	if ((config = alGetConfig(self->port)) == NULL)
***************
*** 762,766 ****
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((resource = alGetResource(self->port)) == 0)
--- 762,766 ----
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, ":GetResource"))
  		return NULL;
  	if ((resource = alGetResource(self->port)) == 0)
***************
*** 781,785 ****
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 781,785 ----
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ":GetFD"))
  		return NULL;
  
***************
*** 802,806 ****
  	int filled;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((filled = alGetFilled(self->port)) < 0)
--- 802,806 ----
  	int filled;
  
! 	if (!PyArg_ParseTuple(args, ":GetFilled"))
  		return NULL;
  	if ((filled = alGetFilled(self->port)) < 0)
***************
*** 821,825 ****
  	int fillable;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((fillable = alGetFillable(self->port)) < 0)
--- 821,825 ----
  	int fillable;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillable"))
  		return NULL;
  	if ((fillable = alGetFillable(self->port)) < 0)
***************
*** 845,849 ****
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  	if (framecount < 0) {
--- 845,849 ----
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "i:ReadFrames", &framecount))
  		return NULL;
  	if (framecount < 0) {
***************
*** 911,915 ****
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  
--- 911,915 ----
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i:DiscardFrames", &framecount))
  		return NULL;
  
***************
*** 936,940 ****
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  
--- 936,940 ----
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i:ZeroFrames", &framecount))
  		return NULL;
  
***************
*** 964,968 ****
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, "i", &fillpoint))
  		return NULL;
  
--- 964,968 ----
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, "i:SetFillPoint", &fillpoint))
  		return NULL;
  
***************
*** 986,990 ****
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 986,990 ----
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillPoint"))
  		return NULL;
  
***************
*** 1007,1011 ****
  	stamp_t fnum;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1007,1011 ----
  	stamp_t fnum;
  
! 	if (!PyArg_ParseTuple(args, ":GetFrameNumber"))
  		return NULL;
  
***************
*** 1029,1033 ****
  	PyObject *ret, *v0, *v1;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (alGetFrameTime(self->port, &fnum, &time) < 0)
--- 1029,1033 ----
  	PyObject *ret, *v0, *v1;
  
! 	if (!PyArg_ParseTuple(args, ":GetFrameTime"))
  		return NULL;
  	if (alGetFrameTime(self->port, &fnum, &time) < 0)
***************
*** 1061,1065 ****
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "s#", &samples, &length))
  		return NULL;
  	c = alGetConfig(self->port);
--- 1061,1065 ----
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "s#:WriteFrames", &samples, &length))
  		return NULL;
  	c = alGetConfig(self->port);
***************
*** 1124,1128 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (alClosePort(self->port) < 0)
--- 1124,1128 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":ClosePort"))
  		return NULL;
  	if (alClosePort(self->port) < 0)
***************
*** 1141,1145 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (ALcloseport(self->port) < 0)
--- 1141,1145 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":ClosePort"))
  		return NULL;
  	if (ALcloseport(self->port) < 0)
***************
*** 1151,1155 ****
  
  static PyObject *
! alp_getfd (self, args)
  	alpobject *self;
  	PyObject *args;
--- 1151,1155 ----
  
  static PyObject *
! alp_getfd(self, args)
  	alpobject *self;
  	PyObject *args;
***************
*** 1157,1161 ****
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((fd = ALgetfd(self-> port)) == -1)
--- 1157,1161 ----
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ":GetFD"))
  		return NULL;
  	if ((fd = ALgetfd(self-> port)) == -1)
***************
*** 1171,1175 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfilled(self-> port)) == -1)
--- 1171,1175 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFilled"))
  		return NULL;
  	if ((count = ALgetfilled(self-> port)) == -1)
***************
*** 1185,1189 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfillable(self-> port)) == -1)
--- 1185,1189 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillable"))
  		return NULL;
  	if ((count = ALgetfillable(self-> port)) == -1)
***************
*** 1203,1207 ****
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "l", &count))
  		return NULL;
  
--- 1203,1207 ----
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "l:readsamps", &count))
  		return NULL;
  
***************
*** 1249,1253 ****
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "s#", &buf, &size))
  		return NULL;
  
--- 1249,1253 ----
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "s#:writesamps", &buf, &size))
  		return NULL;
  
***************
*** 1282,1286 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfillpoint(self->port)) == -1)
--- 1282,1286 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillPoint"))
  		return NULL;
  	if ((count = ALgetfillpoint(self->port)) == -1)
***************
*** 1290,1294 ****
  
  static PyObject *
! alp_setfillpoint (self, args)
  	alpobject *self;
  	PyObject *args;
--- 1290,1294 ----
  
  static PyObject *
! alp_setfillpoint(self, args)
  	alpobject *self;
  	PyObject *args;
***************
*** 1296,1300 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, "l", &count))
  		return NULL;
  	if (ALsetfillpoint(self->port, count) == -1)
--- 1296,1300 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, "l:SetFillPoint", &count))
  		return NULL;
  	if (ALsetfillpoint(self->port, count) == -1)
***************
*** 1311,1315 ****
  	alcobject *config;
  
! 	if (!PyArg_ParseTuple(args, "O!", &Alctype, &config))
  		return NULL;
  	if (ALsetconfig(self->port, config->config) == -1)
--- 1311,1315 ----
  	alcobject *config;
  
! 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
  		return NULL;
  	if (ALsetconfig(self->port, config->config) == -1)
***************
*** 1326,1330 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	config = ALgetconfig(self->port);
--- 1326,1330 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	config = ALgetconfig(self->port);
***************
*** 1505,1509 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = alNewConfig()) == NULL)
--- 1505,1509 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":NewConfig"))
  		return NULL;
  	if ((config = alNewConfig()) == NULL)
***************
*** 1525,1529 ****
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = alOpenPort(name, dir, config ? config->config : NULL)) == NULL)
--- 1525,1529 ----
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!:OpenPort", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = alOpenPort(name, dir, config ? config->config : NULL)) == NULL)
***************
*** 1546,1550 ****
  	PyObject *propobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!", &source, &dest, &PyList_Type, &propobj))
  		return NULL;
  	if (propobj != NULL) {
--- 1546,1550 ----
  	PyObject *propobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!:Connect", &source, &dest, &PyList_Type, &propobj))
  		return NULL;
  	if (propobj != NULL) {
***************
*** 1585,1589 ****
  	int res;
  
! 	if (!PyArg_ParseTuple(args, "i", &res))
  		return NULL;
  	if (alDisconnect(res) < 0)
--- 1585,1589 ----
  	int res;
  
! 	if (!PyArg_ParseTuple(args, "i:Disconnect", &res))
  		return NULL;
  	if (alDisconnect(res) < 0)
***************
*** 1608,1612 ****
  	ALparamInfo *pinfo;
  
! 	if (!PyArg_ParseTuple(args, "iO!", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = PyList_Size(pvslist);
--- 1608,1612 ----
  	ALparamInfo *pinfo;
  
! 	if (!PyArg_ParseTuple(args, "iO!:GetParams", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = PyList_Size(pvslist);
***************
*** 1754,1758 ****
  	int npvs, i;
  
! 	if (!PyArg_ParseTuple(args, "iO!", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = python2params(resource, -1, pvslist, &pvs, &pinfo);
--- 1754,1758 ----
  	int npvs, i;
  
! 	if (!PyArg_ParseTuple(args, "iO!:SetParams", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = python2params(resource, -1, pvslist, &pvs, &pinfo);
***************
*** 1805,1809 ****
  	PyObject *res = NULL, *item;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!", &resource, &param,
  			      &PyList_Type, &qualobj))
  		return NULL;
--- 1805,1809 ----
  	PyObject *res = NULL, *item;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!:QueryValues", &resource, &param,
  			      &PyList_Type, &qualobj))
  		return NULL;
***************
*** 1882,1886 ****
  	PyObject *v, *item;;
  
! 	if (!PyArg_ParseTuple(args, "ii", &res, &param))
  		return NULL;
  	if (alGetParamInfo(res, param, &pinfo) < 0)
--- 1882,1886 ----
  	PyObject *v, *item;;
  
! 	if (!PyArg_ParseTuple(args, "ii:GetParamInfo", &res, &param))
  		return NULL;
  	if (alGetParamInfo(res, param, &pinfo) < 0)
***************
*** 1966,1970 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "isi", &start_res, &name, &type))
  		return NULL;
  	if ((res = alGetResourceByName(start_res, name, type)) == 0)
--- 1966,1970 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "isi:GetResourceByName", &start_res, &name, &type))
  		return NULL;
  	if ((res = alGetResourceByName(start_res, name, type)) == 0)
***************
*** 1984,1988 ****
  	int type, subtype;
  
! 	if (!PyArg_ParseTuple(args, "ii", &type, &subtype))
  		return NULL;
  	return PyInt_FromLong((long) alIsSubtype(type, subtype));
--- 1984,1988 ----
  	int type, subtype;
  
! 	if (!PyArg_ParseTuple(args, "ii:IsSubtype", &type, &subtype))
  		return NULL;
  	return PyInt_FromLong((long) alIsSubtype(type, subtype));
***************
*** 1999,2003 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	Py_INCREF(Py_None);
--- 1999,2003 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":SetErrorHandler"))
  		return NULL;
  	Py_INCREF(Py_None);
***************
*** 2017,2021 ****
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = ALopenport(name, dir, config ? config->config : NULL)) == NULL)
--- 2017,2021 ----
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!:OpenPort", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = ALopenport(name, dir, config ? config->config : NULL)) == NULL)
***************
*** 2030,2034 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = ALnewconfig ()) == NULL)
--- 2030,2034 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":NewConfig"))
  		return NULL;
  	if ((config = ALnewconfig ()) == NULL)
***************
*** 2048,2052 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "l", &device))
  		return NULL;
  	if ((length = ALqueryparams(device, PVdummy, 2L)) == -1)
--- 2048,2052 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "l:queryparams", &device))
  		return NULL;
  	if ((length = ALqueryparams(device, PVdummy, 2L)) == -1)
***************
*** 2128,2132 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	if ((name = ALgetname(device, descriptor)) == NULL)
--- 2128,2132 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "ll:getname", &device, &descriptor))
  		return NULL;
  	if ((name = ALgetname(device, descriptor)) == NULL)
***************
*** 2141,2145 ****
  	long device, descriptor, value;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	if ((value = ALgetdefault(device, descriptor)) == -1)
--- 2141,2145 ----
  	long device, descriptor, value;
  
! 	if (!PyArg_ParseTuple(args, "ll:getdefault", &device, &descriptor))
  		return NULL;
  	if ((value = ALgetdefault(device, descriptor)) == -1)
***************
*** 2154,2158 ****
  	long device, descriptor, min, max;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	min = -1;
--- 2154,2158 ----
  	long device, descriptor, min, max;
  
! 	if (!PyArg_ParseTuple(args, "ll:getminmax", &device, &descriptor))
  		return NULL;
  	min = -1;

Index: audioop.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/audioop.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** audioop.c	1999/09/07 14:24:05	1.34
--- audioop.c	2000/02/29 13:59:22	1.35
***************
*** 982,986 ****
  	weightA = 1;
  	weightB = 0;
! 	if (!PyArg_ParseTuple(args, "s#iiiiO|ii", &cp, &len, &size, &nchannels,
  			      &inrate, &outrate, &state, &weightA, &weightB))
  		return NULL;
--- 982,986 ----
  	weightA = 1;
  	weightB = 0;
! 	if (!PyArg_ParseTuple(args, "s#iiiiO|ii:ratecv", &cp, &len, &size, &nchannels,
  			      &inrate, &outrate, &state, &weightA, &weightB))
  		return NULL;
***************
*** 1035,1039 ****
  		for (chan = 0; chan < nchannels; chan++) {
  			if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
! 					      "ii",&prev_i[chan],&cur_i[chan]))
  				goto exit;
  		}
--- 1035,1039 ----
  		for (chan = 0; chan < nchannels; chan++) {
  			if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
! 					      "ii:ratecv",&prev_i[chan],&cur_i[chan]))
  				goto exit;
  		}

Index: binascii.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/binascii.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** binascii.c	2000/02/16 21:11:52	2.18
--- binascii.c	2000/02/29 13:59:22	2.19
***************
*** 214,218 ****
  	int ascii_len, bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &ascii_len) )
  		return NULL;
  
--- 214,218 ----
  	int ascii_len, bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_uu", &ascii_data, &ascii_len) )
  		return NULL;
  
***************
*** 291,295 ****
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > 45 ) {
--- 291,295 ----
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_uu", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > 45 ) {
***************
*** 373,377 ****
  	int quad_pos = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &ascii_len) )
  		return NULL;
  
--- 373,377 ----
  	int quad_pos = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_base64", &ascii_data, &ascii_len) )
  		return NULL;
  
***************
*** 457,461 ****
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > BASE64_MAXBIN ) {
--- 457,461 ----
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_base64", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > BASE64_MAXBIN ) {
***************
*** 511,515 ****
  	int done = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &len) )
  		return NULL;
  
--- 511,515 ----
  	int done = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_hqx", &ascii_data, &len) )
  		return NULL;
  
***************
*** 574,578 ****
  	int in, inend, len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &in_data, &len) )
  		return NULL;
  
--- 574,578 ----
  	int in, inend, len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:rlecode_hqx", &in_data, &len) )
  		return NULL;
  
***************
*** 625,629 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &len) )
  		return NULL;
  
--- 625,629 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_hqx", &bin_data, &len) )
  		return NULL;
  
***************
*** 665,669 ****
  	int in_len, out_len, out_len_left;
  
! 	if ( !PyArg_ParseTuple(args, "s#", &in_data, &in_len) )
  		return NULL;
  
--- 665,669 ----
  	int in_len, out_len, out_len_left;
  
! 	if ( !PyArg_ParseTuple(args, "s#:rledecode_hqx", &in_data, &in_len) )
  		return NULL;
  
***************
*** 763,767 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#i", &bin_data, &len, &crc) )
  		return NULL;
  
--- 763,767 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#i:crc_hqx", &bin_data, &len, &crc) )
  		return NULL;
  
***************
*** 903,907 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#|l", &bin_data, &len, &crc) )
  		return NULL;
  
--- 903,907 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#|l:crc32", &bin_data, &len, &crc) )
  		return NULL;
  

Index: bsddbmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** bsddbmodule.c	1999/09/20 13:28:18	1.16
--- bsddbmodule.c	2000/02/29 13:59:22	1.17
***************
*** 698,702 ****
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii",
  			      &file, &flag, &mode,
  			      &bsize, &ffactor, &nelem, &cachesize,
--- 698,702 ----
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii:hashopen",
  			      &file, &flag, &mode,
  			      &bsize, &ffactor, &nelem, &cachesize,
***************
*** 751,755 ****
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii",
  			      &file, &flag, &mode,
  			      &btflags, &cachesize, &maxkeypage, &minkeypage,
--- 751,755 ----
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii:btopen",
  			      &file, &flag, &mode,
  			      &btflags, &cachesize, &maxkeypage, &minkeypage,
***************
*** 806,810 ****
  	char *bfname = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiiss",
  			      &file, &flag, &mode,
  			      &rnflags, &cachesize, &psize, &lorder,
--- 806,810 ----
  	char *bfname = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiiss:rnopen",
  			      &file, &flag, &mode,
  			      &rnflags, &cachesize, &psize, &lorder,

Index: cPickle.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** cPickle.c	1999/07/13 15:18:58	2.37
--- cPickle.c	2000/02/29 13:59:22	2.38
***************
*** 1869,1873 ****
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!   if (args && ! PyArg_ParseTuple(args,"")) return NULL;
    if (self->memo) PyDict_Clear(self->memo);
    Py_INCREF(Py_None);
--- 1869,1873 ----
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!   if (args && ! PyArg_ParseTuple(args,":clear_memo")) return NULL;
    if (self->memo) PyDict_Clear(self->memo);
    Py_INCREF(Py_None);
***************
*** 1883,1887 ****
    Pdata *data;
  
!   if (args && ! PyArg_ParseTuple(args,"|i",&clear)) return NULL;
  
    /* Check to make sure we are based on a list */
--- 1883,1887 ----
    Pdata *data;
  
!   if (args && ! PyArg_ParseTuple(args,"|i:getvalue",&clear)) return NULL;
  
    /* Check to make sure we are based on a list */
***************
*** 2015,2019 ****
      int get=0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i", &ob, &get))
          return NULL;
  
--- 2015,2019 ----
      int get=0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i:dump", &ob, &get))
          return NULL;
  
***************
*** 2133,2140 ****
  
      bin=1;
!     if (! PyArg_ParseTuple(args, "|i", &bin)) {
          PyErr_Clear();
          bin=0;
!         if (! PyArg_ParseTuple(args, "O|i", &file, &bin))
            return NULL;
        }
--- 2133,2140 ----
  
      bin=1;
!     if (! PyArg_ParseTuple(args, "|i:Pickler", &bin)) {
          PyErr_Clear();
          bin=0;
!         if (! PyArg_ParseTuple(args, "O|i:Pickler", &file, &bin))
            return NULL;
        }
***************
*** 3854,3858 ****
  static PyObject *
  Unpickler_load(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, "")) 
          return NULL;
  
--- 3854,3858 ----
  static PyObject *
  Unpickler_load(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, ":load")) 
          return NULL;
  
***************
*** 3862,3866 ****
  static PyObject *
  Unpickler_noload(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, "")) 
          return NULL;
  
--- 3862,3866 ----
  static PyObject *
  Unpickler_noload(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, ":noload")) 
          return NULL;
  
***************
*** 3970,3974 ****
      PyObject *file;
    
!     UNLESS (PyArg_ParseTuple(args, "O", &file))
          return NULL;
      return (PyObject *)newUnpicklerobject(file);
--- 3970,3974 ----
      PyObject *file;
    
!     UNLESS (PyArg_ParseTuple(args, "O:Unpickler", &file))
          return NULL;
      return (PyObject *)newUnpicklerobject(file);
***************
*** 4111,4115 ****
      int bin = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i", &ob, &bin))
          goto finally;
  
--- 4111,4115 ----
      int bin = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i:dumps", &ob, &bin))
          goto finally;
  
***************
*** 4138,4142 ****
      PyObject *ob, *res = NULL;
  
!     UNLESS (PyArg_ParseTuple(args, "O", &ob))
          goto finally;
  
--- 4138,4142 ----
      PyObject *ob, *res = NULL;
  
!     UNLESS (PyArg_ParseTuple(args, "O:load", &ob))
          goto finally;
  
***************
*** 4158,4162 ****
      Unpicklerobject *unpickler = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "S", &ob))
          goto finally;
  
--- 4158,4162 ----
      Unpicklerobject *unpickler = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "S:loads", &ob))
          goto finally;
  

Index: cStringIO.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cStringIO.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** cStringIO.c	1999/06/15 14:35:48	2.17
--- cStringIO.c	2000/02/29 13:59:22	2.18
***************
*** 135,139 ****
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i", &position, &mode)) {
      return NULL;
    }
--- 135,139 ----
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i:seek", &position, &mode)) {
      return NULL;
    }
***************
*** 188,192 ****
    char *output;
  
!   UNLESS(PyArg_ParseTuple(args, "|i", &n)) return NULL;
  
    n=O_cread((PyObject*)self,&output,n);
--- 188,192 ----
    char *output;
  
!   UNLESS(PyArg_ParseTuple(args, "|i:read", &n)) return NULL;
  
    n=O_cread((PyObject*)self,&output,n);
***************
*** 265,269 ****
    int l;
  
!   UNLESS(PyArg_ParseTuple(args, "O", &s)) return NULL;
    UNLESS(-1 != (l=PyString_Size(s))) return NULL;
    UNLESS(c=PyString_AsString(s)) return NULL;
--- 265,269 ----
    int l;
  
!   UNLESS(PyArg_ParseTuple(args, "O:write", &s)) return NULL;
    UNLESS(-1 != (l=PyString_Size(s))) return NULL;
    UNLESS(c=PyString_AsString(s)) return NULL;
***************
*** 287,291 ****
  
    use_pos=Py_None;
!   UNLESS(PyArg_ParseTuple(args,"|O",&use_pos)) return NULL;
    if(PyObject_IsTrue(use_pos)) {
        s=self->pos;
--- 287,291 ----
  
    use_pos=Py_None;
!   UNLESS(PyArg_ParseTuple(args,"|O:getval",&use_pos)) return NULL;
    if(PyObject_IsTrue(use_pos)) {
        s=self->pos;
***************
*** 351,355 ****
    static PyObject *string_joinfields = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "O", &args)) {
      return NULL;
    }
--- 351,355 ----
    static PyObject *string_joinfields = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "O:writelines", &args)) {
      return NULL;
    }
***************
*** 501,505 ****
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i", &position, &mode)) {
      return NULL;
    }
--- 501,505 ----
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i:seek", &position, &mode)) {
      return NULL;
    }
***************
*** 604,608 ****
    PyObject *s=0;
  
!   UNLESS(PyArg_ParseTuple(args, "|O", &s)) return NULL;
    if(s) return newIobject(s);
    return newOobject(128);
--- 604,608 ----
    PyObject *s=0;
  
!   UNLESS(PyArg_ParseTuple(args, "|O:StringIO", &s)) return NULL;
    if(s) return newIobject(s);
    return newOobject(128);

Index: cdmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cdmodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** cdmodule.c	1997/10/01 04:43:39	1.17
--- cdmodule.c	2000/02/29 13:59:23	1.18
***************
*** 51,55 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 51,55 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":allowremoval"))
  		return NULL;
  
***************
*** 65,69 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 65,69 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":preventremoval"))
  		return NULL;
  
***************
*** 79,83 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 79,83 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":bestreadsize"))
  		return NULL;
  
***************
*** 90,94 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 90,94 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":close"))
  		return NULL;
  
***************
*** 110,114 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 110,114 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":eject"))
  		return NULL;
  
***************
*** 133,137 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 133,137 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":getstatus"))
  		return NULL;
  
***************
*** 158,162 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "i", &track))
  		return NULL;
  
--- 158,162 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "i:gettrackinfo", &track))
  		return NULL;
  
***************
*** 182,186 ****
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 182,186 ----
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii:msftoblock", &min, &sec, &frame))
  		return NULL;
  
***************
*** 197,201 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii", &start, &play))
  		return NULL;
  
--- 197,201 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii:play", &start, &play))
  		return NULL;
  
***************
*** 221,225 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiii", &min, &sec, &frame, &play))
  		return NULL;
  
--- 221,225 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiii:playabs", &min, &sec, &frame, &play))
  		return NULL;
  
***************
*** 245,249 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii", &start, &play))
  		return NULL;
  
--- 245,249 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii:playtrack", &start, &play))
  		return NULL;
  
***************
*** 269,273 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiiii", &track, &min, &sec,
  			      &frame, &play))
  		return NULL;
--- 269,273 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiiii:playtrackabs", &track, &min, &sec,
  			      &frame, &play))
  		return NULL;
***************
*** 294,298 ****
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "i", &numframes))
  		return NULL;
  
--- 294,298 ----
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "i:readda", &numframes))
  		return NULL;
  
***************
*** 323,327 ****
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 323,327 ----
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "iii:seek", &min, &sec, &frame))
  		return NULL;
  
***************
*** 343,347 ****
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "i", &track))
  		return NULL;
  
--- 343,347 ----
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "i:seektrack", &track))
  		return NULL;
  
***************
*** 362,366 ****
  	unsigned long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "l", &PyTryBlock))
  		return NULL;
  
--- 362,366 ----
  	unsigned long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "l:seekblock", &PyTryBlock))
  		return NULL;
  
***************
*** 381,385 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 381,385 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":stop"))
  		return NULL;
  
***************
*** 404,408 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 404,408 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":togglepause"))
  		return NULL;
  
***************
*** 504,508 ****
  	dev = NULL;
  	direction = "r";
! 	if (!PyArg_ParseTuple(args, "|zs", &dev, &direction))
  		return NULL;
  
--- 504,508 ----
  	dev = NULL;
  	direction = "r";
! 	if (!PyArg_ParseTuple(args, "|zs:open", &dev, &direction))
  		return NULL;
  
***************
*** 606,610 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 606,610 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, ":deleteparser"))
  		return NULL;
  
***************
*** 633,637 ****
  	CDFRAME *p;
  
! 	if (!PyArg_ParseTuple(args, "s#", &cdfp, &length))
  		return NULL;
  
--- 633,637 ----
  	CDFRAME *p;
  
! 	if (!PyArg_ParseTuple(args, "s#:parseframe", &cdfp, &length))
  		return NULL;
  
***************
*** 661,665 ****
  	int type;
  
! 	if (!PyArg_ParseTuple(args, "i", &type))
  		return NULL;
  
--- 661,665 ----
  	int type;
  
! 	if (!PyArg_ParseTuple(args, "i:removecallback", &type))
  		return NULL;
  
***************
*** 686,690 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 686,690 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":resetparser"))
  		return NULL;
  
***************
*** 704,708 ****
  
  	/* XXX - more work here */
! 	if (!PyArg_ParseTuple(args, "iOO", &type, &func, &funcarg))
  		return NULL;
  
--- 704,708 ----
  
  	/* XXX - more work here */
! 	if (!PyArg_ParseTuple(args, "iOO:addcallback", &type, &func, &funcarg))
  		return NULL;
  
***************
*** 817,821 ****
  	CDPARSER *cdp;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	cdp = CDcreateparser();
--- 817,821 ----
  	CDPARSER *cdp;
  
! 	if (!PyArg_ParseTuple(args, ":createparser"))
  		return NULL;
  	cdp = CDcreateparser();
***************
*** 834,838 ****
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 834,838 ----
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii:msftoframe", &min, &sec, &frame))
  		return NULL;
  

Index: dbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/dbmmodule.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** dbmmodule.c	1998/12/04 18:49:44	2.15
--- dbmmodule.c	2000/02/29 13:59:23	2.16
***************
*** 287,291 ****
  	int mode = 0666;
  
!         if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
  		return NULL;
  	if ( strcmp(flags, "r") == 0 )
--- 287,291 ----
  	int mode = 0666;
  
!         if ( !PyArg_ParseTuple(args, "s|si:open", &name, &flags, &mode) )
  		return NULL;
  	if ( strcmp(flags, "r") == 0 )

Index: fcntlmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/fcntlmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** fcntlmodule.c	1999/01/06 18:44:23	2.18
--- fcntlmodule.c	2000/02/29 13:59:23	2.19
***************
*** 235,239 ****
  	PyObject *lenobj = NULL, *startobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|OOi", &fd, &code,
  			      &lenobj, &startobj, &whence))
  	    return NULL;
--- 235,239 ----
  	PyObject *lenobj = NULL, *startobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|OOi:lockf", &fd, &code,
  			      &lenobj, &startobj, &whence))
  	    return NULL;

Index: gdbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/gdbmmodule.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** gdbmmodule.c	2000/02/07 17:19:41	2.20
--- gdbmmodule.c	2000/02/29 13:59:23	2.21
***************
*** 491,495 ****
  	int mode = 0666;
  
! 	if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
  		return NULL;
  	switch (flags[0]) {
--- 491,495 ----
  	int mode = 0666;
  
! 	if ( !PyArg_ParseTuple(args, "s|si:open", &name, &flags, &mode) )
  		return NULL;
  	switch (flags[0]) {

Index: md5module.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/md5module.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** md5module.c	2000/02/04 20:32:35	2.13
--- md5module.c	2000/02/29 13:59:23	2.14
***************
*** 238,242 ****
  	int len = 0;
  
! 	if (!PyArg_ParseTuple(args, "|s#", &cp, &len))
  		return NULL;
  
--- 238,242 ----
  	int len = 0;
  
! 	if (!PyArg_ParseTuple(args, "|s#:new", &cp, &len))
  		return NULL;
  

Index: newmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/newmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** newmodule.c	1998/12/04 18:49:55	2.18
--- newmodule.c	2000/02/29 13:59:23	2.19
***************
*** 46,50 ****
  	PyObject *dict;
  	PyInstanceObject *inst;
! 	if (!PyArg_ParseTuple(args, "O!O!",
  			      &PyClass_Type, &klass,
  			      &PyDict_Type, &dict))
--- 46,50 ----
  	PyObject *dict;
  	PyInstanceObject *inst;
! 	if (!PyArg_ParseTuple(args, "O!O!:instance",
  			      &PyClass_Type, &klass,
  			      &PyDict_Type, &dict))
***************
*** 72,76 ****
  	PyObject* classObj;
  
! 	if (!PyArg_ParseTuple(args, "OOO!",
  			      &func,
  			      &self,
--- 72,76 ----
  	PyObject* classObj;
  
! 	if (!PyArg_ParseTuple(args, "OOO!:instancemethod",
  			      &func,
  			      &self,
***************
*** 106,110 ****
  	PyFunctionObject* newfunc;
  
! 	if (!PyArg_ParseTuple(args, "O!O!|SO!",
  			      &PyCode_Type, &code,
  			      &PyDict_Type, &globals,
--- 106,110 ----
  	PyFunctionObject* newfunc;
  
! 	if (!PyArg_ParseTuple(args, "O!O!|SO!:function",
  			      &PyCode_Type, &code,
  			      &PyDict_Type, &globals,
***************
*** 153,157 ****
  	PyBufferProcs *pb;
  
! 	if (!PyArg_ParseTuple(args, "iiiiOO!O!O!SSiS",
  			      &argcount, &nlocals, &stacksize, &flags,
  			      &code,
--- 153,157 ----
  	PyBufferProcs *pb;
  
! 	if (!PyArg_ParseTuple(args, "iiiiOO!O!O!SSiS:code",
  			      &argcount, &nlocals, &stacksize, &flags,
  			      &code,
***************
*** 189,193 ****
  	char *name;
    
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyModule_New(name);
--- 189,193 ----
  	char *name;
    
! 	if (!PyArg_ParseTuple(args, "s:module", &name))
  		return NULL;
  	return PyModule_New(name);
***************
*** 206,210 ****
  	PyObject * dict;
    
! 	if (!PyArg_ParseTuple(args, "SO!O!", &name, &PyTuple_Type, &classes,
  			      &PyDict_Type, &dict))
  		return NULL;
--- 206,210 ----
  	PyObject * dict;
    
! 	if (!PyArg_ParseTuple(args, "SO!O!:class", &name, &PyTuple_Type, &classes,
  			      &PyDict_Type, &dict))
  		return NULL;

Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pcremodule.c	2000/02/18 18:30:01	2.16
--- pcremodule.c	2000/02/29 13:59:23	2.17
***************
*** 110,114 ****
  	PyObject *list;
  
! 	if (!PyArg_ParseTuple(args, "t#|iiii", &string, &stringlen, &pos, &endpos, &options))
  		return NULL;
  	if (endpos == -1) {endpos = stringlen;}
--- 110,114 ----
  	PyObject *list;
  
! 	if (!PyArg_ParseTuple(args, "t#|iiii:match", &string, &stringlen, &pos, &endpos, &options))
  		return NULL;
  	if (endpos == -1) {endpos = stringlen;}
***************
*** 194,198 ****
  	
  	int options, erroroffset;
! 	if (!PyArg_ParseTuple(args, "siO!", &pattern, &options,
  			      &PyDict_Type, &dictionary))
  		return NULL;
--- 194,198 ----
  	
  	int options, erroroffset;
! 	if (!PyArg_ParseTuple(args, "siO!:pcre_compile", &pattern, &options,
  			      &PyDict_Type, &dictionary))
  		return NULL;
***************
*** 472,476 ****
  	int size, total_len, i, start, pos;
  
! 	if (!PyArg_ParseTuple(args, "OS", &match_obj, &repl_obj)) 
  		return NULL;
  
--- 472,476 ----
  	int size, total_len, i, start, pos;
  
! 	if (!PyArg_ParseTuple(args, "OS:pcre_expand", &match_obj, &repl_obj)) 
  		return NULL;
  

Index: puremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/puremodule.c,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -r2.1 -r2.2
*** puremodule.c	1997/01/17 00:01:29	2.1
--- puremodule.c	2000/02/29 13:59:23	2.2
***************
*** 322,326 ****
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "li", &memrep, &id))
  		return NULL;
  
--- 322,326 ----
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "li:purify_set_pool_id", &memrep, &id))
  		return NULL;
  
***************
*** 344,348 ****
  	long datarep;
  
! 	if (!PyArg_ParseTuple(args, "ll", &memrep, &datarep))
  		return NULL;
  
--- 344,348 ----
  	long datarep;
  
! 	if (!PyArg_ParseTuple(args, "ll:purify_set_user_data", &memrep, &datarep))
  		return NULL;
  
***************
*** 362,366 ****
  	void* data;
  
! 	if (!PyArg_ParseTuple(args, "l", &memrep))
  		return NULL;
  
--- 362,366 ----
  	void* data;
  
! 	if (!PyArg_ParseTuple(args, "l:purify_get_user_data", &memrep))
  		return NULL;
  
***************
*** 412,416 ****
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "iO", &id, &arg_callable))
  		return NULL;
  
--- 412,416 ----
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "iO:purify_map_pool", &id, &arg_callable))
  		return NULL;
  
***************
*** 452,456 ****
  	PyObject* arg_callable;
  
! 	if (!PyArg_ParseTuple(args, "O", &arg_callable))
  		return NULL;
  
--- 452,456 ----
  	PyObject* arg_callable;
  
! 	if (!PyArg_ParseTuple(args, "O:purify_map_pool_id", &arg_callable))
  		return NULL;
  
***************
*** 531,535 ****
  	char* stringarg;
  
! 	if (!PyArg_ParseTuple(args, "s", &stringarg))
  		return NULL;
  
--- 531,535 ----
  	char* stringarg;
  
! 	if (!PyArg_ParseTuple(args, "s:purify_name_thread", &stringarg))
  		return NULL;
  
***************
*** 667,671 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "lis", &addrrep, &size, &type))
  		return NULL;
  
--- 667,671 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "lis:purify_watch_n", &addrrep, &size, &type))
  		return NULL;
  
***************
*** 690,694 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i", &watchno))
  		return NULL;
  
--- 690,694 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i:purify_watch_remove", &watchno))
  		return NULL;
  
***************
*** 712,716 ****
  	char* rtn;
  
! 	if (!PyArg_ParseTuple(args, "l", &addrrep))
  		return NULL;
  
--- 712,716 ----
  	char* rtn;
  
! 	if (!PyArg_ParseTuple(args, "l:purify_describe", &addrrep))
  		return NULL;
  
***************
*** 728,732 ****
  	int status;
      
! 	if (!PyArg_ParseTuple(args, "li", &addrrep, &size))
  		return NULL;
  
--- 728,732 ----
  	int status;
      
! 	if (!PyArg_ParseTuple(args, "li:purify_what_colors", &addrrep, &size))
  		return NULL;
  
***************
*** 773,777 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i", &status))
  		return NULL;
  
--- 773,777 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i:purify_exit", &status))
  		return NULL;
  

Index: readline.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/readline.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** readline.c	1999/11/18 17:51:02	2.15
--- readline.c	2000/02/29 13:59:23	2.16
***************
*** 51,55 ****
  {
  	char *s, *copy;
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	/* Make a copy -- rl_parse_and_bind() modifies its argument */
--- 51,55 ----
  {
  	char *s, *copy;
! 	if (!PyArg_ParseTuple(args, "s:parse_and_bind", &s))
  		return NULL;
  	/* Make a copy -- rl_parse_and_bind() modifies its argument */
***************
*** 79,83 ****
  {
  	char *s = NULL;
! 	if (!PyArg_ParseTuple(args, "|z", &s))
  		return NULL;
  	errno = rl_read_init_file(s);
--- 79,83 ----
  {
  	char *s = NULL;
! 	if (!PyArg_ParseTuple(args, "|z:read_init_file", &s))
  		return NULL;
  	errno = rl_read_init_file(s);
***************
*** 147,151 ****
  	char *break_chars;
  
! 	if(!PyArg_ParseTuple(args, "s", &break_chars)) {
  		return NULL;
  	}
--- 147,151 ----
  	char *break_chars;
  
! 	if(!PyArg_ParseTuple(args, "s:set_completer_delims", &break_chars)) {
  		return NULL;
  	}
***************
*** 184,188 ****
  {
  	PyObject *function = Py_None;
! 	if (!PyArg_ParseTuple(args, "|O", &function))
  		return NULL;
  	if (function == Py_None) {
--- 184,188 ----
  {
  	PyObject *function = Py_None;
! 	if (!PyArg_ParseTuple(args, "|O:set_completer", &function))
  		return NULL;
  	if (function == Py_None) {
***************
*** 240,244 ****
  {
  	char *s;
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	rl_insert_text(s);
--- 240,244 ----
  {
  	char *s;
! 	if (!PyArg_ParseTuple(args, "s:insert_text", &s))
  		return NULL;
  	rl_insert_text(s);

Index: regexmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/regexmodule.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** regexmodule.c	1998/12/04 18:50:02	1.32
--- regexmodule.c	2000/02/29 13:59:23	1.33
***************
*** 120,124 ****
  	int result;
  
! 	if (!PyArg_ParseTuple(args, "O|i", &argstring, &offset))
  		return NULL;
  	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
--- 120,124 ----
  	int result;
  
! 	if (!PyArg_ParseTuple(args, "O|i:match", &argstring, &offset))
  		return NULL;
  	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
***************
*** 159,165 ****
  	int result;
  	
! 	if (!PyArg_ParseTuple(args, "O|i", &argstring, &offset))
  		return NULL;
! 	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
  		return NULL;
  
--- 159,165 ----
  	int result;
  	
! 	if (!PyArg_ParseTuple(args, "O|i:search", &argstring, &offset))
  		return NULL;
! 	if (!PyArg_Parse(argstring, "t#:search", &buffer, &size))
  		return NULL;
  
***************
*** 460,464 ****
  	PyObject *tran = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S", &pat, &tran))
  		return NULL;
  	return newregexobject(pat, tran, pat, NULL);
--- 460,464 ----
  	PyObject *tran = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S:compile", &pat, &tran))
  		return NULL;
  	return newregexobject(pat, tran, pat, NULL);
***************
*** 585,589 ****
  	PyObject *retval = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S", &pattern, &tran))
  		return NULL;
  
--- 585,589 ----
  	PyObject *retval = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S:symcomp", &pattern, &tran))
  		return NULL;
  

Index: resource.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/resource.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** resource.c	1999/01/06 18:44:57	2.9
--- resource.c	2000/02/29 13:59:23	2.10
***************
*** 61,65 ****
  	struct rusage ru;
  
! 	if (!PyArg_ParseTuple(args, "i", &who))
  		return NULL;
  
--- 61,65 ----
  	struct rusage ru;
  
! 	if (!PyArg_ParseTuple(args, "i:getrusage", &who))
  		return NULL;
  
***************
*** 108,112 ****
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, "i", &resource)) 
  		return NULL;
  
--- 108,112 ----
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, "i:getrlimit", &resource)) 
  		return NULL;
  
***************
*** 141,145 ****
  	PyObject *curobj, *maxobj;
  
! 	if (!PyArg_ParseTuple(args, "i(OO)", &resource, &curobj, &maxobj))
  		return NULL;
  
--- 141,145 ----
  	PyObject *curobj, *maxobj;
  
! 	if (!PyArg_ParseTuple(args, "i(OO):setrlimit", &resource, &curobj, &maxobj))
  		return NULL;
  
***************
*** 183,187 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	return Py_BuildValue("i", getpagesize());
--- 183,187 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":getpagesize"))
  		return NULL;
  	return Py_BuildValue("i", getpagesize());

Index: rotormodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/rotormodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** rotormodule.c	1998/12/04 18:50:04	2.21
--- rotormodule.c	2000/02/29 13:59:23	2.22
***************
*** 584,588 ****
  	char *key;
  
! 	if (!PyArg_ParseTuple(args, "s", &key))
  		return NULL;
  
--- 584,588 ----
  	char *key;
  
! 	if (!PyArg_ParseTuple(args, "s:setkey", &key))
  		return NULL;
  
***************
*** 640,644 ****
  	int num_rotors = 6;
  
! 	if (!PyArg_ParseTuple(args, "s#|i", &string, &len, &num_rotors))
  		return NULL;
  
--- 640,644 ----
  	int num_rotors = 6;
  
! 	if (!PyArg_ParseTuple(args, "s#|i:newrotor", &string, &len, &num_rotors))
  		return NULL;
  

Index: selectmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** selectmodule.c	2000/01/14 16:33:09	2.30
--- selectmodule.c	2000/02/29 13:59:23	2.31
***************
*** 244,248 ****
  
  	/* convert arguments */
! 	if (!PyArg_ParseTuple(args, "OOO|O",
  			      &ifdlist, &ofdlist, &efdlist, &tout))
  		return NULL;
--- 244,248 ----
  
  	/* convert arguments */
! 	if (!PyArg_ParseTuple(args, "OOO|O:select",
  			      &ifdlist, &ofdlist, &efdlist, &tout))
  		return NULL;

Index: shamodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/shamodule.c,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** shamodule.c	1999/04/10 15:46:58	2.3
--- shamodule.c	2000/02/29 13:59:23	2.4
***************
*** 549,553 ****
  		return NULL;
  
! 	if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s#", kwlist,
  					 &cp, &len)) {
  	        Py_DECREF(new);
--- 549,553 ----
  		return NULL;
  
! 	if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s#:new", kwlist,
  					 &cp, &len)) {
  	        Py_DECREF(new);

Index: socketmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** socketmodule.c	1999/12/07 21:30:30	1.95
--- socketmodule.c	2000/02/29 13:59:23	1.96
***************
*** 1097,1101 ****
  	PyObject *f;
  
! 	if (!PyArg_ParseTuple(args, "|si", &mode, &bufsize))
  		return NULL;
  #ifdef MS_WIN32
--- 1097,1101 ----
  	PyObject *f;
  
! 	if (!PyArg_ParseTuple(args, "|si:makefile", &mode, &bufsize))
  		return NULL;
  #ifdef MS_WIN32
***************
*** 1132,1136 ****
  	int len, n, flags = 0;
  	PyObject *buf;
! 	if (!PyArg_ParseTuple(args, "i|i", &len, &flags))
  		return NULL;
  	buf = PyString_FromStringAndSize((char *) 0, len);
--- 1132,1136 ----
  	int len, n, flags = 0;
  	PyObject *buf;
! 	if (!PyArg_ParseTuple(args, "i|i:recv", &len, &flags))
  		return NULL;
  	buf = PyString_FromStringAndSize((char *) 0, len);
***************
*** 1169,1173 ****
  
  	int addrlen, len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "i|i", &len, &flags))
  		return NULL;
  	if (!getsockaddrlen(s, &addrlen))
--- 1169,1173 ----
  
  	int addrlen, len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "i|i:recvfrom", &len, &flags))
  		return NULL;
  	if (!getsockaddrlen(s, &addrlen))
***************
*** 1219,1223 ****
  	char *buf;
  	int len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "s#|i", &buf, &len, &flags))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 1219,1223 ----
  	char *buf;
  	int len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1703,1707 ****
  #endif
  	int family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "ii|i", &family, &type, &proto))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 1703,1707 ----
  #endif
  	int family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "ii|i:socket", &family, &type, &proto))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1748,1752 ****
  	PySocketSockObject *s;
  	int fd, family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "iii|i", &fd, &family, &type, &proto))
  		return NULL;
  	/* Dup the fd so it and the socket can be closed independently */
--- 1748,1752 ----
  	PySocketSockObject *s;
  	int fd, family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "iii|i:fromfd", &fd, &family, &type, &proto))
  		return NULL;
  	/* Dup the fd so it and the socket can be closed independently */
***************
*** 2016,2020 ****
  	char *cert_file;
    
! 	if (!PyArg_ParseTuple(args, "O!zz",
  			      &PySocketSock_Type, (PyObject*)&Sock,
  			      &key_file, &cert_file) )
--- 2016,2020 ----
  	char *cert_file;
    
! 	if (!PyArg_ParseTuple(args, "O!zz:ssl",
  			      &PySocketSock_Type, (PyObject*)&Sock,
  			      &key_file, &cert_file) )
***************
*** 2095,2099 ****
  	int len = 0;
    
! 	if (!PyArg_ParseTuple(args, "s|i", &data, &len))
  		return NULL;
    
--- 2095,2099 ----
  	int len = 0;
    
! 	if (!PyArg_ParseTuple(args, "s|i:write", &data, &len))
  		return NULL;
    
***************
*** 2112,2116 ****
  	int res;
    
! 	PyArg_ParseTuple(args, "|i", &len);
    
  	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))
--- 2112,2116 ----
  	int res;
    
! 	PyArg_ParseTuple(args, "|i:read", &len);
    
  	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))

Index: soundex.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/soundex.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** soundex.c	1998/12/04 18:50:08	2.6
--- soundex.c	2000/02/29 13:59:24	2.7
***************
*** 126,130 ****
  	char sdx[7];
  
! 	if(!PyArg_ParseTuple( args, "s", &str))
  	  return NULL;
  
--- 126,130 ----
  	char sdx[7];
  
! 	if(!PyArg_ParseTuple( args, "s:get_soundex", &str))
  	  return NULL;
  
***************
*** 142,146 ****
      char res1[7], res2[7];
      
!     if(!PyArg_ParseTuple(args, "ss", &str1, &str2))
          return NULL;
  
--- 142,146 ----
      char res1[7], res2[7];
      
!     if(!PyArg_ParseTuple(args, "ss:sound_similar", &str1, &str2))
          return NULL;
  

Index: stropmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/stropmodule.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -r2.60 -r2.61
*** stropmodule.c	1999/11/04 19:19:48	2.60
--- stropmodule.c	2000/02/29 13:59:24	2.61
***************
*** 142,146 ****
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "t#|z#i", &s, &len, &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
--- 142,146 ----
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "t#|z#i:split", &s, &len, &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
***************
*** 212,216 ****
  	intargfunc getitemfunc;
  
! 	if (!PyArg_ParseTuple(args, "O|t#", &seq, &sep, &seplen))
  		return NULL;
  	if (sep == NULL) {
--- 212,216 ----
  	intargfunc getitemfunc;
  
! 	if (!PyArg_ParseTuple(args, "O|t#:join", &seq, &sep, &seplen))
  		return NULL;
  	if (sep == NULL) {
***************
*** 339,343 ****
  	int len, n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
--- 339,343 ----
  	int len, n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:find", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
***************
*** 384,388 ****
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
--- 384,388 ----
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:rfind", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
***************
*** 643,647 ****
  
  	/* Get arguments */
! 	if (!PyArg_ParseTuple(args, "s#|i", &string, &stringlen, &tabsize))
  		return NULL;
  	if (tabsize < 1) {
--- 643,647 ----
  
  	/* Get arguments */
! 	if (!PyArg_ParseTuple(args, "s#|i:expandtabs", &string, &stringlen, &tabsize))
  		return NULL;
  	if (tabsize < 1) {
***************
*** 709,713 ****
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
--- 709,713 ----
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:count", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
***************
*** 804,808 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i", &s, &base))
  		return NULL;
  
--- 804,808 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i:atoi", &s, &base))
  		return NULL;
  
***************
*** 859,863 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i", &s, &base))
  		return NULL;
  
--- 859,863 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i:atol", &s, &base))
  		return NULL;
  
***************
*** 905,909 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	while (*s && isspace(Py_CHARMASK(*s)))
--- 905,909 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s:atof", &s))
  		return NULL;
  	while (*s && isspace(Py_CHARMASK(*s)))
***************
*** 949,953 ****
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "t#t#", &from, &fromlen, &to, &tolen))
  		return NULL;
  
--- 949,953 ----
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "t#t#:maketrans", &from, &fromlen, &to, &tolen))
  		return NULL;
  
***************
*** 992,996 ****
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "St#|t#", &input_obj,
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
--- 992,996 ----
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "St#|t#:translate", &input_obj,
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
***************
*** 1206,1210 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#t#|i",
  			      &str, &len, &pat, &pat_len, &sub, &sub_len,
  			      &count))
--- 1206,1210 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#t#|i:replace",
  			      &str, &len, &pat, &pat_len, &sub, &sub_len,
  			      &count))

Index: structmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/structmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** structmodule.c	1998/12/04 18:50:11	2.29
--- structmodule.c	2000/02/29 13:59:24	2.30
***************
*** 1098,1102 ****
  	int size;
  
! 	if (!PyArg_ParseTuple(args, "s", &fmt))
  		return NULL;
  	f = whichtable(&fmt);
--- 1098,1102 ----
  	int size;
  
! 	if (!PyArg_ParseTuple(args, "s:calcsize", &fmt))
  		return NULL;
  	f = whichtable(&fmt);
***************
*** 1263,1267 ****
  	PyObject *res, *v;
  
! 	if (!PyArg_ParseTuple(args, "ss#", &fmt, &start, &len))
  		return NULL;
  	f = whichtable(&fmt);
--- 1263,1267 ----
  	PyObject *res, *v;
  
! 	if (!PyArg_ParseTuple(args, "ss#:unpack", &fmt, &start, &len))
  		return NULL;
  	f = whichtable(&fmt);

Index: syslogmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/syslogmodule.c,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** syslogmodule.c	1998/12/04 18:50:12	2.12
--- syslogmodule.c	2000/02/29 13:59:24	2.13
***************
*** 106,110 ****
  	PyObject * args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	closelog();
--- 106,110 ----
  	PyObject * args;
  {
! 	if (!PyArg_ParseTuple(args, ":closelog"))
  		return NULL;
  	closelog();
***************
*** 135,139 ****
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l", &pri))
  		return NULL;
  	mask = LOG_MASK(pri);
--- 135,139 ----
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l:LOG_MASK", &pri))
  		return NULL;
  	mask = LOG_MASK(pri);
***************
*** 148,152 ****
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l", &pri))
  		return NULL;
  	mask = LOG_UPTO(pri);
--- 148,152 ----
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l:LOG_UPTO", &pri))
  		return NULL;
  	mask = LOG_UPTO(pri);

Index: threadmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/threadmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** threadmodule.c	1998/12/21 19:32:43	2.29
--- threadmodule.c	2000/02/29 13:59:24	2.30
***************
*** 252,256 ****
  	struct bootstate *boot;
  
! 	if (!PyArg_ParseTuple(fargs, "OO|O", &func, &args, &keyw))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 252,256 ----
  	struct bootstate *boot;
  
! 	if (!PyArg_ParseTuple(fargs, "OO|O:start_new_thread", &func, &args, &keyw))
  		return NULL;
  	if (!PyCallable_Check(func)) {

Index: timemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.78
retrieving revision 2.79
diff -C2 -r2.78 -r2.79
*** timemodule.c	2000/01/12 16:38:20	2.78
--- timemodule.c	2000/02/29 13:59:24	2.79
***************
*** 374,378 ****
  	memset((ANY *) &buf, '\0', sizeof(buf));
  
! 	if (!PyArg_ParseTuple(args, "sO", &fmt, &tup) || !gettmarg(tup, &buf))
  		return NULL;
  	fmtlen = strlen(fmt);
--- 374,378 ----
  	memset((ANY *) &buf, '\0', sizeof(buf));
  
! 	if (!PyArg_ParseTuple(args, "sO:strftime", &fmt, &tup) || !gettmarg(tup, &buf))
  		return NULL;
  	fmtlen = strlen(fmt);
***************
*** 422,426 ****
  	char *s;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &buf, &fmt)) {
  		PyErr_SetString(PyExc_ValueError, "invalid argument");
  		return NULL;
--- 422,426 ----
  	char *s;
  
! 	if (!PyArg_ParseTuple(args, "s|s:strptime", &buf, &fmt)) {
  		PyErr_SetString(PyExc_ValueError, "invalid argument");
  		return NULL;
***************
*** 456,460 ****
  	struct tm buf;
  	char *p;
! 	if (!PyArg_ParseTuple(args, "O", &tup))
  		return NULL;
  	if (!gettmarg(tup, &buf))
--- 456,460 ----
  	struct tm buf;
  	char *p;
! 	if (!PyArg_ParseTuple(args, "O:asctime", &tup))
  		return NULL;
  	if (!gettmarg(tup, &buf))
***************
*** 507,511 ****
  	struct tm buf;
  	time_t tt;
! 	if (!PyArg_ParseTuple(args, "O", &tup))
  		return NULL;
  	tt = time(&tt);
--- 507,511 ----
  	struct tm buf;
  	time_t tt;
! 	if (!PyArg_ParseTuple(args, "O:mktime", &tup))
  		return NULL;
  	tt = time(&tt);

Index: xxmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/xxmodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** xxmodule.c	1999/02/16 22:15:42	2.14
--- xxmodule.c	2000/02/29 13:59:24	2.15
***************
*** 85,89 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	Py_INCREF(Py_None);
--- 85,89 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":demo"))
  		return NULL;
  	Py_INCREF(Py_None);
***************
*** 164,168 ****
  	long i, j;
  	long res;
! 	if (!PyArg_ParseTuple(args, "ll", &i, &j))
  		return NULL;
  	res = i+j; /* XXX Do something here */
--- 164,168 ----
  	long i, j;
  	long res;
! 	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
  		return NULL;
  	res = i+j; /* XXX Do something here */
***************
*** 180,184 ****
  	XxoObject *rv;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	rv = newXxoObject(args);
--- 180,184 ----
  	XxoObject *rv;
  	
! 	if (!PyArg_ParseTuple(args, ":new"))
  		return NULL;
  	rv = newXxoObject(args);
***************
*** 197,201 ****
  	PyObject *list, *item;
  	
! 	if (!PyArg_ParseTuple(args, "O", &list))
  		return NULL;
  	
--- 197,201 ----
  	PyObject *list, *item;
  	
! 	if (!PyArg_ParseTuple(args, "O:bug", &list))
  		return NULL;
  	
***************
*** 220,224 ****
  	PyObject *a;
  	long b;
! 	if (!PyArg_ParseTuple(args, "O#", &a, &b))
  		return NULL;
  	Py_INCREF(Py_None);
--- 220,224 ----
  	PyObject *a;
  	long b;
! 	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
  		return NULL;
  	Py_INCREF(Py_None);

Index: zlibmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/zlibmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** zlibmodule.c	1999/12/22 16:13:54	2.29
--- zlibmodule.c	2000/02/29 13:59:24	2.30
***************
*** 75,79 ****
    z_stream zst;
    
!   if (!PyArg_ParseTuple(args, "s#|i", &input, &length, &level))
      return NULL;
    zst.avail_out = length + length/1000 + 12 + 1;
--- 75,79 ----
    z_stream zst;
    
!   if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level))
      return NULL;
    zst.avail_out = length + length/1000 + 12 + 1;
***************
*** 173,177 ****
    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
    z_stream zst;
!   if (!PyArg_ParseTuple(args, "s#|ii", &input, &length, &wsize, &r_strlen))
      return NULL;
  
--- 173,177 ----
    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
    z_stream zst;
!   if (!PyArg_ParseTuple(args, "s#|ii:decompress", &input, &length, &wsize, &r_strlen))
      return NULL;
  
***************
*** 279,283 ****
    int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
  
!   if (!PyArg_ParseTuple(args, "|iiiii", &level, &method, &wbits,
  			&memLevel, &strategy))
        return NULL;
--- 279,283 ----
    int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
  
!   if (!PyArg_ParseTuple(args, "|iiiii:compressobj", &level, &method, &wbits,
  			&memLevel, &strategy))
        return NULL;
***************
*** 326,330 ****
    int wbits=DEF_WBITS, err;
    compobject *self;
!   if (!PyArg_ParseTuple(args, "|i", &wbits))
      {
       return NULL;
--- 326,330 ----
    int wbits=DEF_WBITS, err;
    compobject *self;
!   if (!PyArg_ParseTuple(args, "|i:decompressobj", &wbits))
      {
       return NULL;
***************
*** 404,408 ****
    unsigned long start_total_out;
    
!   if (!PyArg_ParseTuple(args, "s#", &input, &inplen))
        return NULL;
    self->zst.avail_in = inplen;
--- 404,408 ----
    unsigned long start_total_out;
    
!   if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
        return NULL;
    self->zst.avail_in = inplen;
***************
*** 462,466 ****
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "s#", &input, &inplen))
      return NULL;
    start_total_out = self->zst.total_out;
--- 462,466 ----
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "s#:decompress", &input, &inplen))
      return NULL;
    start_total_out = self->zst.total_out;
***************
*** 536,540 ****
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "|i", &flushmode))
        return NULL;
  
--- 536,540 ----
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "|i:flush", &flushmode))
        return NULL;
  
***************
*** 746,750 ****
      int len;
   
!     if (!PyArg_ParseTuple(args, "s#|l", &buf, &len, &adler32val))
      {
  	return NULL;
--- 746,750 ----
      int len;
   
!     if (!PyArg_ParseTuple(args, "s#|l:adler32", &buf, &len, &adler32val))
      {
  	return NULL;
***************
*** 768,772 ****
      Byte *buf;
      int len;
!     if (!PyArg_ParseTuple(args, "s#|l", &buf, &len, &crc32val))
      {
  	return NULL;
--- 768,772 ----
      Byte *buf;
      int len;
!     if (!PyArg_ParseTuple(args, "s#|l:crc32", &buf, &len, &crc32val))
      {
  	return NULL;