[Python-checkins] CVS: python/dist/src/Objects iterobject.c,1.3,1.3.2.1

[Guido van Rossum]

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

Modified Files:
      Tag: descr-branch
	iterobject.c 
Log Message:
Add PyGeneric_GetAttr to tp_getattro.


Index: iterobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/iterobject.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** iterobject.c	2001/04/23 14:08:49	1.3
--- iterobject.c	2001/04/30 14:25:44	1.3.2.1
***************
*** 89,98 ****
  };
  
- static PyObject *
- iter_getattr(seqiterobject *it, char *name)
- {
- 	return Py_FindMethod(iter_methods, (PyObject *)it, name);
- }
- 
  PyTypeObject PySeqIter_Type = {
  	PyObject_HEAD_INIT(&PyType_Type)
--- 89,92 ----
***************
*** 104,108 ****
  	(destructor)iter_dealloc, 		/* tp_dealloc */
  	0,					/* tp_print */
! 	(getattrfunc)iter_getattr,		/* tp_getattr */
  	0,					/* tp_setattr */
  	0,					/* tp_compare */
--- 98,102 ----
  	(destructor)iter_dealloc, 		/* tp_dealloc */
  	0,					/* tp_print */
! 	0,					/* tp_getattr */
  	0,					/* tp_setattr */
  	0,					/* tp_compare */
***************
*** 114,118 ****
  	0,					/* tp_call */
  	0,					/* tp_str */
! 	0,					/* tp_getattro */
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
--- 108,112 ----
  	0,					/* tp_call */
  	0,					/* tp_str */
! 	PyGeneric_GetAttr,			/* tp_getattro */
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
***************
*** 125,128 ****
--- 119,129 ----
  	(getiterfunc)iter_getiter,		/* tp_iter */
  	(iternextfunc)iter_iternext,		/* tp_iternext */
+ 	iter_methods,				/* tp_methods */
+ 	0,					/* tp_members */
+ 	0,					/* tp_getset */
+ 	0,					/* tp_base */
+ 	0,					/* tp_dict */
+ 	0,					/* tp_descr_get */
+ 	0,					/* tp_descr_set */
  };
  
***************
*** 177,186 ****
  
  static PyObject *
- calliter_getattr(calliterobject *it, char *name)
- {
- 	return Py_FindMethod(calliter_methods, (PyObject *)it, name);
- }
- 
- static PyObject *
  calliter_iternext(calliterobject *it)
  {
--- 178,181 ----
***************
*** 207,211 ****
  	(destructor)calliter_dealloc, 		/* tp_dealloc */
  	0,					/* tp_print */
! 	(getattrfunc)calliter_getattr,		/* tp_getattr */
  	0,					/* tp_setattr */
  	0,					/* tp_compare */
--- 202,206 ----
  	(destructor)calliter_dealloc, 		/* tp_dealloc */
  	0,					/* tp_print */
! 	0,					/* tp_getattr */
  	0,					/* tp_setattr */
  	0,					/* tp_compare */
***************
*** 217,221 ****
  	0,					/* tp_call */
  	0,					/* tp_str */
! 	0,					/* tp_getattro */
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
--- 212,216 ----
  	0,					/* tp_call */
  	0,					/* tp_str */
! 	PyGeneric_GetAttr,			/* tp_getattro */
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
***************
*** 228,230 ****
--- 223,232 ----
  	(getiterfunc)iter_getiter,		/* tp_iter */
  	(iternextfunc)calliter_iternext,	/* tp_iternext */
+ 	calliter_methods,			/* tp_methods */
+ 	0,					/* tp_members */
+ 	0,					/* tp_getset */
+ 	0,					/* tp_base */
+ 	0,					/* tp_dict */
+ 	0,					/* tp_descr_get */
+ 	0,					/* tp_descr_set */
  };