[Python-checkins] python/dist/src/Objects genobject.c,1.1,1.2

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17662

Modified Files:
	genobject.c 
Log Message:
* Factor out PyObject_SelfIter().
* Change a XDECREF to DECREF (adding an assertion just to be sure).



Index: genobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/genobject.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** genobject.c	1 Jun 2004 15:22:42 -0000	1.1
--- genobject.c	12 Jun 2004 05:17:55 -0000	1.2
***************
*** 51,55 ****
  	 * may keep a chain of frames alive or it could create a reference
  	 * cycle. */
! 	Py_XDECREF(f->f_back);
  	f->f_back = NULL;
  
--- 51,56 ----
  	 * may keep a chain of frames alive or it could create a reference
  	 * cycle. */
! 	assert(f->f_back != NULL);
! 	Py_DECREF(f->f_back);
  	f->f_back = NULL;
  
***************
*** 64,74 ****
  }
  
- static PyObject *
- gen_getiter(PyObject *gen)
- {
- 	Py_INCREF(gen);
- 	return gen;
- }
- 
  static PyMemberDef gen_memberlist[] = {
  	{"gi_frame",	T_OBJECT, offsetof(PyGenObject, gi_frame),	RO},
--- 65,68 ----
***************
*** 105,109 ****
  	0,					/* tp_richcompare */
  	offsetof(PyGenObject, gi_weakreflist),	/* tp_weaklistoffset */
! 	(getiterfunc)gen_getiter,		/* tp_iter */
  	(iternextfunc)gen_iternext,		/* tp_iternext */
  	0,					/* tp_methods */
--- 99,103 ----
  	0,					/* tp_richcompare */
  	offsetof(PyGenObject, gi_weakreflist),	/* tp_weaklistoffset */
! 	PyObject_SelfIter,			/* tp_iter */
  	(iternextfunc)gen_iternext,		/* tp_iternext */
  	0,					/* tp_methods */