diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-06-05 11:59:41 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-06-05 11:59:41 (GMT) |
| commit | 80068da395457a496af5db713c586a09f75836f9 (patch) | |
| tree | 473c9ede8234ea7436d8d61a6465bd65eadb7737 /Objects | |
| parent | c5010e0669cc54278b1887625574eb89cf7f8672 (diff) | |
| download | cpython-80068da395457a496af5db713c586a09f75836f9.zip cpython-80068da395457a496af5db713c586a09f75836f9.tar.gz cpython-80068da395457a496af5db713c586a09f75836f9.tar.bz2 | |
Merged revisions 81736 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81736 | mark.dickinson | 2010-06-05 12:52:24 +0100 (Sat, 05 Jun 2010) | 1 line
Issue #8627: remove out-of-date warning about overriding __cmp__
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 30e7a2d..af2dc0b 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3707,7 +3707,6 @@ overrides_name(PyTypeObject *type, char *name) } #define OVERRIDES_HASH(x) overrides_name(x, "__hash__") -#define OVERRIDES_CMP(x) overrides_name(x, "__cmp__") #define OVERRIDES_EQ(x) overrides_name(x, "__eq__") static void @@ -3853,12 +3852,6 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base) if (base->tp_hash && (base->tp_hash != PyObject_HashNotImplemented) && !OVERRIDES_HASH(type)) { - if (OVERRIDES_CMP(type)) { - PyErr_WarnPy3k("Overriding " - "__cmp__ blocks inheritance " - "of __hash__ in 3.x", - 1); - } if (OVERRIDES_EQ(type)) { PyErr_WarnPy3k("Overriding " "__eq__ blocks inheritance " |