commit 17301e9fab311badbbe26a1efcb2decf637b324a
author Raymond Hettinger <python@rcn.com> Thu Mar 13 00:19:26 2008 +0000
committer Raymond Hettinger <python@rcn.com> Thu Mar 13 00:19:26 2008 +0000
tree 1326aa6f309cc11fa17b4aee81c26eea77d47e1e
parent 45832ea4082c6df50021dbeb9a157aad851fdeb8

Issue 2186 and 2187.  Move filter from itertools to builtins.

Lib/filecmp.py

diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index 12ba3ef..14e1eb4 100644
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -12,7 +12,7 @@
 import os
 import stat
 import warnings
-from itertools import ifilter, ifilterfalse, imap, izip
+from itertools import ifilterfalse, imap, izip
 
 __all__ = ["cmp","dircmp","cmpfiles"]
 
@@ -132,7 +132,7 @@
     def phase1(self): # Compute common names
         a = dict(izip(imap(os.path.normcase, self.left_list), self.left_list))
         b = dict(izip(imap(os.path.normcase, self.right_list), self.right_list))
-        self.common = list(map(a.__getitem__, ifilter(b.__contains__, a)))
+        self.common = list(map(a.__getitem__, filter(b.__contains__, a)))
         self.left_only = list(map(a.__getitem__, ifilterfalse(b.__contains__, a)))
         self.right_only = list(map(b.__getitem__, ifilterfalse(a.__contains__, b)))
 

Lib/test/test_itertools.py

diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index 4e0902b..13dc1f9 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -8,6 +8,7 @@
 from functools import reduce
 maxsize = test_support.MAX_Py_ssize_t
 minsize = -maxsize-1
+ifilter = filter
 
 def lzip(*args):
     return list(zip(*args))