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.
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 @@
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;