summaryrefslogtreecommitdiff
path: root/Objects/object.c
diff options
context:
space:
mode:
Diffstat (limited to 'Objects/object.c')
-rw-r--r--Objects/object.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/Objects/object.c b/Objects/object.c
index 698ba47601..a10ac7ce19 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -863,8 +863,18 @@ try_3way_to_rich_compare(PyObject *v, PyObject *w, int op)
int c;
c = try_3way_compare(v, w);
- if (c >= 2)
+ if (c >= 2) {
+
+ /* Py3K warning if types are not equal and comparison isn't == or != */
+ if (Py_Py3kWarningFlag &&
+ v->ob_type != w->ob_type && op != Py_EQ && op != Py_NE &&
+ PyErr_Warn(PyExc_DeprecationWarning,
+ "comparing unequal types not supported in 3.x.") < 0) {
+ return NULL;
+ }
+
c = default_3way_compare(v, w);
+ }
if (c <= -2)
return NULL;
return convert_3way_to_object(op, c);