traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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__
........
This commit is contained in:
Mark Dickinson 2010-06-05 11:59:41 +00:00
parent c5010e0669
commit 80068da395
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,6 +12,9 @@ What's New in Python 2.6.6 alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #8627: Remove bogus "Overriding __cmp__ blocks inheritance of
__hash__ in 3.x" warning.
- Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding - Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding
and error handler, instead of writing to the C stderr file in utf-8 and error handler, instead of writing to the C stderr file in utf-8

7
Objects/typeobject.c
View File

@ -3707,7 +3707,6 @@ overrides_name(PyTypeObject *type, char *name)
} }
#define OVERRIDES_HASH(x) overrides_name(x, "__hash__") #define OVERRIDES_HASH(x) overrides_name(x, "__hash__")
#define OVERRIDES_CMP(x) overrides_name(x, "__cmp__")
#define OVERRIDES_EQ(x) overrides_name(x, "__eq__") #define OVERRIDES_EQ(x) overrides_name(x, "__eq__")
static void static void
@ -3853,12 +3852,6 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
if (base->tp_hash && if (base->tp_hash &&
(base->tp_hash != PyObject_HashNotImplemented) && (base->tp_hash != PyObject_HashNotImplemented) &&
!OVERRIDES_HASH(type)) { !OVERRIDES_HASH(type)) {
if (OVERRIDES_CMP(type)) {
PyErr_WarnPy3k("Overriding "
"__cmp__ blocks inheritance "
"of __hash__ in 3.x",
1);
}
if (OVERRIDES_EQ(type)) { if (OVERRIDES_EQ(type)) {
PyErr_WarnPy3k("Overriding " PyErr_WarnPy3k("Overriding "
"__eq__ blocks inheritance " "__eq__ blocks inheritance "