[Python-checkins] CVS: python/dist/src/Objects abstract.c,2.56,2.57

[Guido van Rossum]

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

Modified Files:
	abstract.c 
Log Message:
Rich comparisons fall-out:

- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.

- Use PyObject_RichCompareBool() in PySequence_Contains().


Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.56
retrieving revision 2.57
diff -C2 -r2.56 -r2.57
*** abstract.c	2001/01/04 01:39:06	2.56
--- abstract.c	2001/01/17 15:29:42	2.57
***************
*** 7,11 ****
  
  #define NEW_STYLE_NUMBER(o) PyType_HasFeature((o)->ob_type, \
! 				Py_TPFLAGS_NEWSTYLENUMBER)
  
  /* Shorthands to return certain errors */
--- 7,11 ----
  
  #define NEW_STYLE_NUMBER(o) PyType_HasFeature((o)->ob_type, \
! 				Py_TPFLAGS_CHECKTYPES)
  
  /* Shorthands to return certain errors */
***************
*** 1364,1372 ****
  			return -1;
  		}
! 		cmp = PyObject_Compare(v, x);
  		Py_XDECREF(x);
! 		if (cmp == 0)
  			return 1;
! 		if (PyErr_Occurred())
  			return -1;
  	}
--- 1364,1372 ----
  			return -1;
  		}
! 		cmp = PyObject_RichCompareBool(v, x, Py_EQ);
  		Py_XDECREF(x);
! 		if (cmp > 0)
  			return 1;
! 		if (cmp < 0)
  			return -1;
  	}