summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-05 11:52:24 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-06-05 11:52:24 (GMT)
commit23f0d6b57bb9427df0ab2305c47f14b9c092e0fe (patch)
treed0171be9015e9218b2d8a4ff2fb89bbf0cc95cf5 /Objects
parenta441287f79ac793a0fe046b85f2e5e12364c6a84 (diff)
downloadcpython-23f0d6b57bb9427df0ab2305c47f14b9c092e0fe.zip
cpython-23f0d6b57bb9427df0ab2305c47f14b9c092e0fe.tar.gz
cpython-23f0d6b57bb9427df0ab2305c47f14b9c092e0fe.tar.bz2
Issue #8627: remove out-of-date warning about overriding __cmp__
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 605d8a0..5767b87 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3723,7 +3723,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
@@ -3869,12 +3868,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 "