[Python-checkins] python/dist/src/Objects object.c,2.197,2.198

gvanrossum@users.sourceforge.net gvanrossum@users.sourceforge.net
Tue, 18 Feb 2003 08:40:16 -0800


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

Modified Files:
	object.c 
Log Message:
default_3way_compare(): use PyNumber_Check(), rather than testing for
tp_as_number directly.


Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.197
retrieving revision 2.198
diff -C2 -d -r2.197 -r2.198
*** object.c	5 Feb 2003 19:35:19 -0000	2.197
--- object.c	18 Feb 2003 16:40:09 -0000	2.198
***************
*** 634,643 ****
  		return 1;
  
! 	/* different type: compare type names */
! 	if (v->ob_type->tp_as_number)
  		vname = "";
  	else
  		vname = v->ob_type->tp_name;
! 	if (w->ob_type->tp_as_number)
  		wname = "";
  	else
--- 634,643 ----
  		return 1;
  
! 	/* different type: compare type names; numbers are smaller */
! 	if (PyNumber_Check(v))
  		vname = "";
  	else
  		vname = v->ob_type->tp_name;
! 	if (PyNumber_Check(w))
  		wname = "";
  	else