From: Guido van Rossum <guido@python.org>
Date: Wed, 17 Jan 2001 15:29:42 +0000 (+0000)
Subject: Rich comparisons fall-out:
X-Git-Tag: v2.1a1~204
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c31896960a24202bd972e8c79d288cd3a80fac94;p=python

Rich comparisons fall-out:

- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.

- Use PyObject_RichCompareBool() in PySequence_Contains().
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 9050a4ce23..1189ae805d 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -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;
 	}