Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Make sure the itertools filter functions give the same performance for func=bool as func=None.

This commit is contained in:
Raymond Hettinger 2008-02-25 22:42:32 +00:00
parent df4198915a
commit 9d63837e9b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_itertools.py
View File

@ -171,6 +171,7 @@ class TestBasicOps(unittest.TestCase):
def test_ifilter(self):
self.assertEqual(list(ifilter(isEven, range(6))), [0,2,4])
self.assertEqual(list(ifilter(None, [0,1,0,2,0])), [1,2])
self.assertEqual(list(ifilter(bool, [0,1,0,2,0])), [1,2])
self.assertEqual(take(4, ifilter(isEven, count())), [0,2,4,6])
self.assertRaises(TypeError, ifilter)
self.assertRaises(TypeError, ifilter, lambda x:x)
@ -181,6 +182,7 @@ class TestBasicOps(unittest.TestCase):
def test_ifilterfalse(self):
self.assertEqual(list(ifilterfalse(isEven, range(6))), [1,3,5])
self.assertEqual(list(ifilterfalse(None, [0,1,0,2,0])), [0,0,0])
self.assertEqual(list(ifilterfalse(bool, [0,1,0,2,0])), [0,0,0])
self.assertEqual(take(4, ifilterfalse(isEven, count())), [1,3,5,7])
self.assertRaises(TypeError, ifilterfalse)
self.assertRaises(TypeError, ifilterfalse, lambda x:x)

4
Modules/itertoolsmodule.c
View File

@ -2055,7 +2055,7 @@ ifilter_next(ifilterobject *lz)
if (item == NULL)
return NULL;
if (lz->func == Py_None) {
if (lz->func == Py_None || lz->func == PyBool_Type) {
ok = PyObject_IsTrue(item);
} else {
PyObject *good;
@ -2199,7 +2199,7 @@ ifilterfalse_next(ifilterfalseobject *lz)
if (item == NULL)
return NULL;
if (lz->func == Py_None) {
if (lz->func == Py_None || lz->func == PyBool_Type) {
ok = PyObject_IsTrue(item);
} else {
PyObject *good;