Mercurial > cpython-lru_cache-weakref
diff Objects/stringobject.c @ 39222:b0cdcbcc5f45
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!
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Thu, 27 Jul 2006 21:53:35 +0000 |
| parents | 19fd6141940d |
| children | 654c380cf8b9 |
line wrap: on
line diff
--- a/Objects/stringobject.c Thu Jun 08 15:35:45 2006 +0000 +++ b/Objects/stringobject.c Thu Jul 27 21:53:35 2006 +0000 @@ -1184,13 +1184,11 @@ return x; } -#define HASINDEX(o) PyType_HasFeature((o)->ob_type, Py_TPFLAGS_HAVE_INDEX) - static PyObject* string_subscript(PyStringObject* 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; @@ -4004,8 +4002,7 @@ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ &string_as_buffer, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | - Py_TPFLAGS_BASETYPE, /* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ string_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */