summaryrefslogtreecommitdiffstats
path: root/Objects/tupleobject.c
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-04-24 16:52:47 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-04-24 16:52:47 (GMT)
commit9928571f3f09ece9430c4eb503ac7e9188d1b185 (patch)
tree2ebeef8113f1d705554fb74912aa3a4e67ebfb3c /Objects/tupleobject.c
parent3209410cb53457c0aa2facceb8d9a6ad24e1702d (diff)
downloadcpython-9928571f3f09ece9430c4eb503ac7e9188d1b185.zip
cpython-9928571f3f09ece9430c4eb503ac7e9188d1b185.tar.gz
cpython-9928571f3f09ece9430c4eb503ac7e9188d1b185.tar.bz2
SF bug 665835: filter() treatment of str and tuple inconsistent
As a side issue on this bug, it was noted that list and tuple iterators used macros to directly access containers and would not recognize __getitem__ overrides. If the method is overridden, the patch returns a generic sequence iterator which calls the __getitem__ method; otherwise, it returns a high custom iterator with direct access to container elements.
Diffstat (limited to 'Objects/tupleobject.c')
-rw-r--r--Objects/tupleobject.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 282da3e..645480c 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -753,6 +753,8 @@ tuple_iter(PyObject *seq)
PyErr_BadInternalCall();
return NULL;
}
+ if (seq->ob_type->tp_as_sequence->sq_item != tupleitem)
+ return PySeqIter_New(seq);
it = PyObject_GC_New(tupleiterobject, &PyTupleIter_Type);
if (it == NULL)
return NULL;