mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 23:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 76794 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76794 | benjamin.peterson | 2009-12-13 10:36:53 -0600 (Sun, 13 Dec 2009) | 2 lines

  fix the ignoring of __cmp__ method on metaclasses #7491
........
This commit is contained in:
Benjamin Peterson 2009-12-13 16:41:44 +00:00
parent 62926f0b1e
commit d76e711eab
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/typeobject.c
View file

@ -645,7 +645,11 @@ type_richcompare(PyObject *v, PyObject *w, int op)
int c;
/* Make sure both arguments are types. */
if (!PyType_Check(v) || !PyType_Check(w)) {
if (!PyType_Check(v) || !PyType_Check(w) ||
/* If there is a __cmp__ method defined, let it be called instead
of our dumb function designed merely to warn. See bug
#7491. */
Py_TYPE(v)->tp_compare || Py_TYPE(w)->tp_compare) {
result = Py_NotImplemented;
goto out;
}