diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2003-02-10 17:36:40 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2003-02-10 17:36:40 (GMT) |
| commit | 8dd19321bbb3b4f94d15ca3a405053265b99e91e (patch) | |
| tree | 8fd34769278798e5b54dfe4f9248cef56f2e3977 | |
| parent | 8d326b8581e8246d006bd4c5ab1d9f30972ef5cb (diff) | |
| download | cpython-8dd19321bbb3b4f94d15ca3a405053265b99e91e.zip cpython-8dd19321bbb3b4f94d15ca3a405053265b99e91e.tar.gz cpython-8dd19321bbb3b4f94d15ca3a405053265b99e91e.tar.bz2 | |
Change filtertuple() to use tp_as_sequence->sq_item
instead of PyTuple_GetItem, so an overwritten __getitem__
in a tuple subclass works. SF bug #665835.
| -rw-r--r-- | Lib/test/test_builtin.py | 3 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 9af3233..f52d9c6 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -419,7 +419,6 @@ class BuiltinTest(unittest.TestCase): def test_filter_subclasses(self): # test, that filter() never returns tuple, str or unicode subclasses # and that the result always go's through __getitem__ - # FIXME: For tuple currently it doesn't go through __getitem__ funcs = (None, lambda x: True) class tuple2(tuple): def __getitem__(self, index): @@ -428,7 +427,7 @@ class BuiltinTest(unittest.TestCase): def __getitem__(self, index): return 2*str.__getitem__(self, index) inputs = { - tuple2: {(): (), (1, 2, 3): (1, 2, 3)}, # FIXME + tuple2: {(): (), (1, 2, 3): (2, 4, 6)}, str2: {"": "", "123": "112233"} } if have_unicode: diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index b9aa85c..338e38d 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1888,8 +1888,13 @@ filtertuple(PyObject *func, PyObject *tuple) PyObject *item, *good; int ok; - if ((item = PyTuple_GetItem(tuple, i)) == NULL) + if (tuple->ob_type->tp_as_sequence && + tuple->ob_type->tp_as_sequence->sq_item) { + item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i); + } else { + PyErr_SetString(PyExc_TypeError, "unsubscriptable object"); goto Fail_1; + } if (func == Py_None) { Py_INCREF(item); good = item; |