REF: Replace filters with list comprehensions.

2to3 does a lot of list(filter(...)) sort of thing which can be
avoided by using list comprehensions instead of filters. This
also seems to clarify the code to a considerable degree.

3 files changed, 8 insertions, 8 deletions

diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py
index 2070570ff..6e3073c43 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 = list(filter(is_string, self.py_modules))
+        new_py_modules = [_m for _m in self.py_modules if is_string(_m)]
         self.py_modules[:] = new_py_modules
         modules = old_build_py.find_modules(self)
         self.py_modules[:] = old_py_modules
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index f5ad0b198..1f0a2858a 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 = list(filter(is_string, ext.sources))
+    sources = [_m for _m in ext.sources if is_string(_m)]
     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 = list(filter(is_string, scripts))
+    scripts = [_m for _m in scripts if is_string(_m)]
     return scripts
 
 def get_lib_source_files(lib):
     filenames = []
     sources = lib[1].get('sources',[])
-    sources = list(filter(is_string, sources))
+    sources = [_m for _m in sources if is_string(_m)]
     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 = list(filter(os.path.isdir,glob.glob(subpackage_path)))
+        dirs = [_m for _m in glob.glob(subpackage_path) if os.path.isdir(_m)]
         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 e9d0ac588..7b99a701a 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 = 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))
+default_lib_dirs = [_m for _m in default_lib_dirs if os.path.isdir(_m)]
+default_include_dirs = [_m for _m in default_include_dirs if os.path.isdir(_m)]
+default_src_dirs = [_m for _m in default_src_dirs if os.path.isdir(_m)]
 
 so_ext = get_shared_lib_extension()