[Python-checkins] CVS: python/dist/src/Objects listobject.c,2.93,2.94

Tim Peters tim_one@users.sourceforge.net
Fri, 25 May 2001 22:50:05 -0700


Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv31220/python/dist/src/Objects

Modified Files:
	listobject.c 
Log Message:
Cruft cleanup:  removed the #ifdef'ery in support of compiling to allow
multi-argument list.append(1, 2, 3) (as opposed to .append((1,2,3))).


Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.93
retrieving revision 2.94
diff -C2 -r2.93 -r2.94
*** listobject.c	2001/05/26 05:28:40	2.93
--- listobject.c	2001/05/26 05:50:03	2.94
***************
*** 577,599 ****
  }
  
- /* Define NO_STRICT_LIST_APPEND to enable multi-argument append() */
- 
- #ifndef NO_STRICT_LIST_APPEND
- #define PyArg_ParseTuple_Compat1 PyArg_ParseTuple
- #else
- #define PyArg_ParseTuple_Compat1(args, format, ret) \
- ( \
- 	PyTuple_GET_SIZE(args) > 1 ? (*ret = args, 1) : \
- 	PyTuple_GET_SIZE(args) == 1 ? (*ret = PyTuple_GET_ITEM(args, 0), 1) : \
- 	PyArg_ParseTuple(args, format, ret) \
- )
- #endif
- 
- 
  static PyObject *
  listappend(PyListObject *self, PyObject *args)
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple_Compat1(args, "O:append", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
--- 577,585 ----
  }
  
  static PyObject *
  listappend(PyListObject *self, PyObject *args)
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O:append", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
***************
*** 1362,1366 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple_Compat1(args, "O:index", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1348,1352 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:index", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
***************
*** 1382,1386 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple_Compat1(args, "O:count", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1368,1372 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:count", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
***************
*** 1400,1404 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple_Compat1(args, "O:remove", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1386,1390 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:remove", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {