summaryrefslogtreecommitdiff
path: root/numpy/distutils/misc_util.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-02-28 13:19:41 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-02-28 13:19:41 -0700
commit9a73697c70e667c4655a01d3f76e5a9e850f1798 (patch)
treeab8b03aa0404e875c4b1082e56a38ee62d8b3bdc /numpy/distutils/misc_util.py
parentb990ed5a18b58715fa1e13642bc7f6761e597818 (diff)
downloadnumpy-9a73697c70e667c4655a01d3f76e5a9e850f1798.tar.gz
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.
Diffstat (limited to 'numpy/distutils/misc_util.py')
-rw-r--r--numpy/distutils/misc_util.py8
1 files changed, 4 insertions, 4 deletions
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')):