summaryrefslogtreecommitdiffstats
path: root/Include/object.h
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-02-01 13:59:22 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-02-01 13:59:22 (GMT)
commitc008a176afdef8cb7afc0e48a8fb306f986964e8 (patch)
tree9cfaabad2089cf789a0ea4f0a17420cd28bc16a3 /Include/object.h
parentf02e0aaafd2476948047f0ce904af947f02d18ea (diff)
downloadcpython-c008a176afdef8cb7afc0e48a8fb306f986964e8.zip
cpython-c008a176afdef8cb7afc0e48a8fb306f986964e8.tar.gz
cpython-c008a176afdef8cb7afc0e48a8fb306f986964e8.tar.bz2
Issue #1717, continued: remove PyObject_Compare and Py_CmpToRich declarations
from object.h; don't inherit tp_compare slot on subclasses; and raise TypeError when initializing a type that has a nonzero tp_compare slot. Fix up comparison-related comments in object.c and code.h.
Diffstat (limited to 'Include/object.h')
-rw-r--r--Include/object.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/Include/object.h b/Include/object.h
index b1391ca..30538b5 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -426,10 +426,8 @@ PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
PyAPI_FUNC(PyObject *) PyObject_ASCII(PyObject *);
PyAPI_FUNC(PyObject *) PyObject_Bytes(PyObject *);
-PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);
-PyAPI_FUNC(PyObject *) Py_CmpToRich(int op, int cmp);
PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *);
PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *);
PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);