2to3: Apply `filter` fixes. Closes #3053.

Generally, this involves using list comprehension, or explicit list
construction as `filter` is an iterator in Python 3.

4 files changed, 10 insertions, 10 deletions

diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py
index 4c02e4136..2070570ff 100644
--- a/numpy/distutils/command/build_py.py
+++ b/numpy/distutils/command/build_py.py
@@ -21,7 +21,7 @@ class build_py(old_build_py):
 
     def find_modules(self):
         old_py_modules = self.py_modules[:]
-        new_py_modules = filter(is_string, self.py_modules)
+        new_py_modules = list(filter(is_string, self.py_modules))
         self.py_modules[:] = new_py_modules
         modules = old_build_py.find_modules(self)
         self.py_modules[:] = old_py_modules
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py
index 7bf3b43ce..75dc5e12b 100644
--- a/numpy/distutils/command/build_src.py
+++ b/numpy/distutils/command/build_src.py
@@ -186,8 +186,8 @@ class build_src(build_ext.build_ext):
                     build_dir = self.get_package_dir('.'.join(d.split(os.sep)))
                 else:
                     build_dir = os.path.join(self.build_src,d)
-                funcs = filter(lambda f:hasattr(f, '__call__'), files)
-                files = filter(lambda f:not hasattr(f, '__call__'), files)
+                funcs = [f for f in files if hasattr(f, '__call__')]
+                files = [f for f in files if not hasattr(f, '__call__')]
                 for f in funcs:
                     if f.func_code.co_argcount==1:
                         s = f(build_dir)
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 3a9eb3b13..f5ad0b198 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -555,7 +555,7 @@ def general_source_directories_files(top_path):
 def get_ext_source_files(ext):
     # Get sources and any include files in the same directory.
     filenames = []
-    sources = filter(is_string, ext.sources)
+    sources = list(filter(is_string, ext.sources))
     filenames.extend(sources)
     filenames.extend(get_dependencies(sources))
     for d in ext.depends:
@@ -566,13 +566,13 @@ def get_ext_source_files(ext):
     return filenames
 
 def get_script_files(scripts):
-    scripts = filter(is_string, scripts)
+    scripts = list(filter(is_string, scripts))
     return scripts
 
 def get_lib_source_files(lib):
     filenames = []
     sources = lib[1].get('sources',[])
-    sources = filter(is_string, sources)
+    sources = list(filter(is_string, sources))
     filenames.extend(sources)
     filenames.extend(get_dependencies(sources))
     depends = lib[1].get('depends',[])
@@ -808,7 +808,7 @@ class Configuration(object):
                                  caller_level = 1):
         l = subpackage_name.split('.')
         subpackage_path = njoin([self.local_path]+l)
-        dirs = filter(os.path.isdir,glob.glob(subpackage_path))
+        dirs = list(filter(os.path.isdir,glob.glob(subpackage_path)))
         config_list = []
         for d in dirs:
             if not os.path.isfile(njoin(d,'__init__.py')):
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index 38a8b25a5..e9d0ac588 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -232,9 +232,9 @@ if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
     default_include_dirs.append(os.path.join(sys.prefix, 'include'))
     default_src_dirs.append(os.path.join(sys.prefix, 'src'))
 
-default_lib_dirs = filter(os.path.isdir, default_lib_dirs)
-default_include_dirs = filter(os.path.isdir, default_include_dirs)
-default_src_dirs = filter(os.path.isdir, default_src_dirs)
+default_lib_dirs = list(filter(os.path.isdir, default_lib_dirs))
+default_include_dirs = list(filter(os.path.isdir, default_include_dirs))
+default_src_dirs = list(filter(os.path.isdir, default_src_dirs))
 
 so_ext = get_shared_lib_extension()