diff options
| author | Guido van Rossum <guido@python.org> | 2006-07-27 21:53:35 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-07-27 21:53:35 (GMT) |
| commit | 3cf5b1eef99fbd85bbd2bcd2e6223dfec92daf8b (patch) | |
| tree | 310222781e7a80027e813b9e61b9b412fecc9a87 /Objects/tupleobject.c | |
| parent | 73e5a5b65d66f4fba9c4f626bcd6400f4a7215e6 (diff) | |
| download | cpython-3cf5b1eef99fbd85bbd2bcd2e6223dfec92daf8b.zip cpython-3cf5b1eef99fbd85bbd2bcd2e6223dfec92daf8b.tar.gz cpython-3cf5b1eef99fbd85bbd2bcd2e6223dfec92daf8b.tar.bz2 | |
Get rid of most of the flags (in tp_flags) that keep track of various
variations of the type struct and its attachments. In Py3k, all type
structs have to have all fields -- no binary backwards compatibility.
Had to change the complex object to a new-style number!
Diffstat (limited to 'Objects/tupleobject.c')
| -rw-r--r-- | Objects/tupleobject.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 2161ab9..53afab5 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -577,13 +577,11 @@ static PySequenceMethods tuple_as_sequence = { (objobjproc)tuplecontains, /* sq_contains */ }; -#define HASINDEX(o) PyType_HasFeature((o)->ob_type, Py_TPFLAGS_HAVE_INDEX) - static PyObject* tuplesubscript(PyTupleObject* self, PyObject* item) { PyNumberMethods *nb = item->ob_type->tp_as_number; - if (nb != NULL && HASINDEX(item) && nb->nb_index != NULL) { + if (nb != NULL && nb->nb_index != NULL) { Py_ssize_t i = nb->nb_index(item); if (i == -1 && PyErr_Occurred()) return NULL; |