[Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.80.2.2,2.80.2.3
Guido van Rossum
gvanrossum@users.sourceforge.net
Mon, 30 Apr 2001 07:24:47 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv28580
Modified Files:
Tag: descr-branch
dictobject.c
Log Message:
Add PyGeneric_GetAttr to tp_getattro of DictIter object.
Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.80.2.2
retrieving revision 2.80.2.3
diff -C2 -r2.80.2.2 -r2.80.2.3
*** dictobject.c 2001/04/27 18:04:50 2.80.2.2
--- dictobject.c 2001/04/30 14:24:45 2.80.2.3
***************
*** 1461,1470 ****
};
- static PyObject *
- dictiter_getattr(dictiterobject *di, char *name)
- {
- return Py_FindMethod(dictiter_methods, (PyObject *)di, name);
- }
-
static PyObject *dictiter_iternext(dictiterobject *di)
{
--- 1461,1464 ----
***************
*** 1492,1496 ****
(destructor)dictiter_dealloc, /* tp_dealloc */
0, /* tp_print */
! (getattrfunc)dictiter_getattr, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
--- 1486,1490 ----
(destructor)dictiter_dealloc, /* tp_dealloc */
0, /* tp_print */
! 0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
***************
*** 1502,1506 ****
0, /* tp_call */
0, /* tp_str */
! 0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
--- 1496,1500 ----
0, /* tp_call */
0, /* tp_str */
! PyGeneric_GetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
***************
*** 1513,1515 ****
--- 1507,1516 ----
(getiterfunc)dictiter_getiter, /* tp_iter */
(iternextfunc)dictiter_iternext, /* tp_iternext */
+ dictiter_methods, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
};