[Python-checkins] python/dist/src/Objects iterobject.c,1.7,1.7.16.1

[nascheme@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	iterobject.c 
Log Message:
Remove calls to 2.1 GC API (they are noops).


Index: iterobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/iterobject.c,v
retrieving revision 1.7
retrieving revision 1.7.16.1
diff -C2 -d -r1.7 -r1.7.16.1
*** iterobject.c	16 Aug 2001 13:15:00 -0000	1.7
--- iterobject.c	5 Aug 2002 14:45:43 -0000	1.7.16.1
***************
*** 19,23 ****
  	Py_INCREF(seq);
  	it->it_seq = seq;
- 	PyObject_GC_Init(it);
  	return (PyObject *)it;
  }
--- 19,22 ----
***************
*** 25,31 ****
  iter_dealloc(seqiterobject *it)
  {
- 	PyObject_GC_Fini(it);
  	Py_DECREF(it->it_seq);
- 	it = (seqiterobject *) PyObject_AS_GC(it);
  	PyObject_DEL(it);
  }
--- 24,28 ----
***************
*** 101,105 ****
  	0,					/* ob_size */
  	"iterator",				/* tp_name */
! 	sizeof(seqiterobject) + PyGC_HEAD_SIZE,	/* tp_basicsize */
  	0,					/* tp_itemsize */
  	/* methods */
--- 98,102 ----
  	0,					/* ob_size */
  	"iterator",				/* tp_name */
! 	sizeof(seqiterobject),			/* tp_basicsize */
  	0,					/* tp_itemsize */
  	/* methods */
***************
*** 119,123 ****
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,	/* tp_flags */
   	0,					/* tp_doc */
   	(traverseproc)iter_traverse,		/* tp_traverse */
--- 116,120 ----
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT,			/* tp_flags */
   	0,					/* tp_doc */
   	(traverseproc)iter_traverse,		/* tp_traverse */
***************
*** 155,159 ****
  	Py_INCREF(sentinel);
  	it->it_sentinel = sentinel;
- 	PyObject_GC_Init(it);
  	return (PyObject *)it;
  }
--- 152,155 ----
***************
*** 161,168 ****
  calliter_dealloc(calliterobject *it)
  {
- 	PyObject_GC_Fini(it);
  	Py_DECREF(it->it_callable);
  	Py_DECREF(it->it_sentinel);
- 	it = (calliterobject *) PyObject_AS_GC(it);
  	PyObject_DEL(it);
  }
--- 157,162 ----
***************
*** 219,223 ****
  	0,					/* ob_size */
  	"callable-iterator",			/* tp_name */
! 	sizeof(calliterobject) + PyGC_HEAD_SIZE,/* tp_basicsize */
  	0,					/* tp_itemsize */
  	/* methods */
--- 213,217 ----
  	0,					/* ob_size */
  	"callable-iterator",			/* tp_name */
! 	sizeof(calliterobject),			/* tp_basicsize */
  	0,					/* tp_itemsize */
  	/* methods */
***************
*** 237,241 ****
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,	/* tp_flags */
   	0,					/* tp_doc */
   	(traverseproc)calliter_traverse,	/* tp_traverse */
--- 231,235 ----
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT,			/* tp_flags */
   	0,					/* tp_doc */
   	(traverseproc)calliter_traverse,	/* tp_traverse */