Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rich comparisons fall-out: 

- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.

- Use PyObject_RichCompareBool() in PySequence_Contains().
This commit is contained in:
Guido van Rossum 2001-01-17 15:29:42 +00:00
parent 8998b4f691
commit c31896960a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/abstract.c
View File

@ -6,7 +6,7 @@
#include "structmember.h" /* we need the offsetof() macro from there */
#define NEW_STYLE_NUMBER(o) PyType_HasFeature((o)->ob_type, \
Py_TPFLAGS_NEWSTYLENUMBER)
Py_TPFLAGS_CHECKTYPES)
/* Shorthands to return certain errors */
@ -1363,11 +1363,11 @@ PySequence_Contains(PyObject *w, PyObject *v) /* v in w */
}
return -1;
}
cmp = PyObject_Compare(v, x);
cmp = PyObject_RichCompareBool(v, x, Py_EQ);
Py_XDECREF(x);
if (cmp == 0)
if (cmp > 0)
return 1;
if (PyErr_Occurred())
if (cmp < 0)
return -1;
}