[Python-checkins] python/dist/src/Objects typeobject.c,2.126.4.8,2.126.4.9

[gvanrossum@sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	typeobject.c 
Log Message:
Darn.  Of course the warning that Tim killed on the trunk must also be
killed in the branch.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.126.4.8
retrieving revision 2.126.4.9
diff -C2 -d -r2.126.4.8 -r2.126.4.9
*** typeobject.c	18 Apr 2002 00:36:17 -0000	2.126.4.8
--- typeobject.c	18 Apr 2002 04:47:10 -0000	2.126.4.9
***************
*** 92,96 ****
  	}
  	else if (result->ob_type->tp_descr_get) {
! 		result = result->ob_type->tp_descr_get(result, NULL, type);
  	}
  	else {
--- 92,97 ----
  	}
  	else if (result->ob_type->tp_descr_get) {
! 		result = result->ob_type->tp_descr_get(result, NULL,
! 						       (PyObject *)type);
  	}
  	else {