[Python-checkins] python/dist/src/Objects abstract.c,2.117,2.118

[gvanrossum@users.sourceforge.net]

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

Modified Files:
	abstract.c 
Log Message:
Make PyNumber_Check() a bit more careful, since all sorts of things
now have tp_as_number.  Check for nb_int or nb_float.


Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.117
retrieving revision 2.118
diff -C2 -d -r2.117 -r2.118
*** abstract.c	12 Feb 2003 03:36:05 -0000	2.117
--- abstract.c	18 Feb 2003 16:33:49 -0000	2.118
***************
*** 309,313 ****
  PyNumber_Check(PyObject *o)
  {
! 	return o && o->ob_type->tp_as_number;
  }
  
--- 309,315 ----
  PyNumber_Check(PyObject *o)
  {
! 	return o && o->ob_type->tp_as_number &&
! 	       (o->ob_type->tp_as_number->nb_int ||
! 		o->ob_type->tp_as_number->nb_float);
  }