mirror of
https://github.com/python/cpython.git
synced 2025-09-16 13:47:31 +00:00
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
This commit is contained in:
parent
a8b09fd4c3
commit
ae42f33cdf
6 changed files with 166 additions and 3 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue