[Python-checkins] CVS: python/dist/src/Objects listobject.c,2.80,2.81 stringobject.c,2.81,2.82 unicodeobject.c,2.43,2.44

Jeremy Hylton python-dev@python.org
Wed, 12 Jul 2000 06:03:05 -0700


Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4183/Objects

Modified Files:
	listobject.c stringobject.c unicodeobject.c 
Log Message:
replace PyXXX_Length calls with PyXXX_Size calls


Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.80
retrieving revision 2.81
diff -C2 -r2.80 -r2.81
*** listobject.c	2000/07/09 15:16:51	2.80
--- listobject.c	2000/07/12 13:03:02	2.81
***************
*** 564,568 ****
  		return NULL;
  
! 	if (PyObject_Length(b) == 0)
  		/* short circuit when b is empty */
  		goto ok;
--- 564,568 ----
  		return NULL;
  
! 	if (PyObject_Size(b) == 0)
  		/* short circuit when b is empty */
  		goto ok;
***************
*** 586,590 ****
  	}
  
! 	blen = PyObject_Length(b);
  
  	/* resize a using idiom */
--- 586,590 ----
  	}
  
! 	blen = PyObject_Size(b);
  
  	/* resize a using idiom */

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.81
retrieving revision 2.82
diff -C2 -r2.81 -r2.82
*** stringobject.c	2000/07/12 02:58:28	2.81
--- stringobject.c	2000/07/12 13:03:02	2.82
***************
*** 760,764 ****
  	 * reference count manipulations.
  	 */
! 	seqlen = PySequence_Length(seq);
  	if (seqlen == 1) {
  		item = PySequence_Fast_GET_ITEM(seq, 0);
--- 760,764 ----
  	 * reference count manipulations.
  	 */
! 	seqlen = PySequence_Size(seq);
  	if (seqlen == 1) {
  		item = PySequence_Fast_GET_ITEM(seq, 0);

Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.43
retrieving revision 2.44
diff -C2 -r2.43 -r2.44
*** unicodeobject.c	2000/07/11 09:47:04	2.43
--- unicodeobject.c	2000/07/12 13:03:02	2.44
***************
*** 2651,2655 ****
      int i;
  
!     seqlen = PySequence_Length(seq);
      if (seqlen < 0 && PyErr_Occurred())
  	return NULL;
--- 2651,2655 ----
      int i;
  
!     seqlen = PySequence_Size(seq);
      if (seqlen < 0 && PyErr_Occurred())
  	return NULL;