[Python-checkins] python/dist/src/Objects typeobject.c,2.222,2.223

[gvanrossum@users.sourceforge.net]

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

Modified Files:
	typeobject.c 
Log Message:
super_getattro(): kill some dead code; explain a mystery.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.222
retrieving revision 2.223
diff -C2 -d -r2.222 -r2.223
*** typeobject.c	9 Apr 2003 21:01:42 -0000	2.222
--- typeobject.c	14 Apr 2003 21:20:26 -0000	2.223
***************
*** 5356,5376 ****
  				break;
  		}
- #if 0
- 		if (i >= n && PyType_Check(su->obj)) {
- 			starttype = (PyTypeObject *)(su->obj);
- 			mro = starttype->tp_mro;
- 			if (mro == NULL)
- 				n = 0;
- 			else {
- 				assert(PyTuple_Check(mro));
- 				n = PyTuple_GET_SIZE(mro);
- 			}
- 			for (i = 0; i < n; i++) {
- 				if ((PyObject *)(su->type) ==
- 				    PyTuple_GET_ITEM(mro, i))
- 					break;
- 			}
- 		}
- #endif
  		i++;
  		res = NULL;
--- 5356,5359 ----
***************
*** 5384,5388 ****
  				continue;
  			res = PyDict_GetItem(dict, name);
! 			if (res != NULL  && !PyDescr_IsData(res)) {
  				Py_INCREF(res);
  				f = res->ob_type->tp_descr_get;
--- 5367,5374 ----
  				continue;
  			res = PyDict_GetItem(dict, name);
! 			/* Skip data descriptors because when obj_type is a
! 			   metaclass, we don't want to return its __class__
! 			   descriptor.  See supers() in test_descr.py. */
! 			if (res != NULL && !PyDescr_IsData(res)) {
  				Py_INCREF(res);
  				f = res->ob_type->tp_descr_get;