8000 REF: Replace filters with list comprehensions. · numpy/numpy@9a73697 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9a73697

Browse files
charrischarris
committed
REF: Replace filters with list comprehensions.
2to3 does a lot of list(filter(...)) sort of thing which can be avoided by using list comprehensions inst 8000 ead of filters. This also seems to clarify the code to a considerable degree.
1 parent b990ed5 commit 9a73697

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

‎numpy/distutils/command/build_py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def find_package_modules(self, package, package_dir):
2121

2222
def find_modules(self):
2323
old_py_modules = self.py_modules[:]
24-
new_py_modules = list(filter(is_string, self.py_modules))
24+
new_py_modules = [_m for _m in self.py_modules if is_string(_m)]
2525
self.py_modules[:] = new_py_modules
2626
modules = old_build_py.find_modules(self)
2727
self.py_modules[:] = old_py_modules

‎numpy/distutils/misc_util.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ def general_source_directories_files(top_path):
555555
def get_ext_source_files(ext):
556556
# Get sources and any include files in the same directory.
557557
filenames = []
558-
sources = list(filter(is_string, ext.sources))
558+
sources = [_m for _m in ext.sources if is_string(_m)]
559559
filenames.extend(sources)
560560
filenames.extend(get_dependencies(sources))
561561
for d in ext.depends:
@@ -566,13 +566,13 @@ def get_ext_source_files(ext):
566566
return filenames
567567

568568
def get_script_files(scripts):
569-
scripts = list(filter(is_string, scripts))
569+
scripts = [_m for _m in scripts if is_string(_m)]
570570
return scripts
571571

572572
def get_lib_source_files(lib):
573573
filenames = []
574574
sources = lib[1].get('sources',[])
575-
sources = list(filter(is_string, sources))
575+
sources = [_m for _m in sources if is_string(_m)]
576576
filenames.extend(sources)
577577
filenames.extend(get_dependencies(sources))
578578
depends = lib[1].get('depends',[])
@@ -808,7 +808,7 @@ def _wildcard_get_subpackage(self, subpackage_name,
808808
caller_level = 1):
809809
l = subpackage_name.split('.')
810810
subpackage_path = njoin([self.local_path]+l)
811-
dirs = list(filter(os.path.isdir,glob.glob(subpackage_path)))
811+
dirs = [_m for _m in glob.glob(subpackage_path) if os.path.isdir(_m)]
812812
config_list = []
813813
for d in dirs:
814814
if not os.path.isfile(njoin(d,'__init__.py')):

‎numpy/distutils/system_info.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ def libpaths(paths, bits):
232232
default_include_dirs.append(os.path.join(sys.prefix, 'include'))
233233
default_src_dirs.append(os.path.join(sys.prefix, 'src'))
234234

235-
default_lib_dirs = list(filter(os.path.isdir, default_lib_dirs))
236-
default_include_dirs = list(filter(os.path.isdir, default_include_dirs))
237-
default_src_dirs = list(filter(os.path.isdir, default_src_dirs))
235+
default_lib_dirs = [_m for _m in default_lib_dirs if os.path.isdir(_m)]
236+
default_include_dirs = [_m for _m in default_include_dirs if os.path.isdir(_m)]
237+
default_src_dirs = [_m for _m in default_src_dirs if os.path.isdir(_m)]
238238

239239
so_ext = get_shared_lib_extension()
240240

‎numpy/f2py/f2py2e.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -430,13 +430,14 @@ def run_compile():
430430
remove_build_dir = 1
431431
build_dir = os.path.join(tempfile.mktemp())
432432

433-
sysinfo_flags = list(filter(re.compile(r'[-][-]link[-]').match,sys.argv[1:]))
434-
sys.argv = list(filter(lambda < 6D47 span class="pl-s1 x">a,flags=sysinfo_flags:a not in flags,sys.argv))
433+
sysinfo_flags = [_m for _m in sys.argv[1] if re.compile(r'[-][-]link[-]').match(_m)]
434+
sys.argv = [_m for _m in sys.argv if not _m in sysinfo_flags]
435435
if sysinfo_flags:
436436
sysinfo_flags = [f[7:] for f in sysinfo_flags]
437437

438-
f2py_flags = list(filter(re.compile(r'[-][-]((no[-]|)(wrap[-]functions|lower)|debug[-]capi|quiet)|[-]include').match,sys.argv[1:]))
439-
sys.argv = list(filter(lambda a,flags=f2py_flags:a not in flags,sys.argv))
438+
f2py_flags = [_m for _m in sys.argv[1:] if
439+
re.compile(r'[-][-]((no[-]|)(wrap[-]functions|lower)|debug[-]capi|quiet)|[-]include').match(_m)]
440+
sys.argv = [_m for _m in sys.argv if not _m in f2py_flags]
440441
f2py_flags2 = []
441442
fl = 0
442443
for a in sys.argv[1:]:
@@ -450,12 +451,13 @@ def run_compile():
450451
f2py_flags2.append(':')
451452
f2py_flags.extend(f2py_flags2)
452453

453-
sys.argv = list(filter(lambda a,flags=f2py_flags2:a not in flags,sys.argv))
454-
455-
flib_flags = list(filter(re.compile(r'[-][-]((f(90)?compiler([-]exec|)|compiler)=|help[-]compiler)').match,sys.argv[1:]))
456-
sys.argv = list(filter(lambda a,flags=flib_flags:a not in flags,sys.argv))
457-
fc_flags = list(filter(re.compile(r'[-][-]((f(77|90)(flags|exec)|opt|arch)=|(debug|noopt|noarch|help[-]fcompiler))').match,sys.argv[1:]))
458-
sys.argv = list(filter(lambda a,flags=fc_flags:a not in flags,sys.argv))
454+
sys.argv = [_m for _m in sys.argv if _m not in f2py_flags2]
455+
flib_flags = [_m for _m in sys.argv[1:] if
456+
re.compile(r'[-][-]((f(90)?compiler([-]exec|)|compiler)=|help[-]compiler)').match(_m)]
457+
sys.argv = [_m for _m in sys.argv if not _m in flib_flags]
458+
fc_flags = [_m for _m in sys.argv[1:] if
459+
re.compile(r'[-][-]((f(77|90)(flags|exec)|opt|arch)=|(debug|noopt|noarch|help[-]fcompiler))').match(_m)]
460+
sys.argv = [_m for _m in sys.argv if not _m in fc_flags]
459461

460462
if 1:
461463
del_list = []
@@ -481,8 +483,11 @@ def run_compile():
481483
i = flib_flags.index(s)
482484
del flib_flags[i]
483485
assert len(flib_flags)<=2,`flib_flags`
484-
setup_flags = list(filter(re.compile(r'[-][-](verbose)').match,sys.argv[1:]))
485-
sys.argv = list(filter(lambda a,flags=setup_flags:a not in flags,sys.argv))
486+
487+
setup_flags = [_m for _m in sys.argv[1:] if
488+
re.compile(r'[-][-](verbose)').match(_m)]
489+
sys.argv = [_m for _m in sys.argv if not _m in setup_flags]
490+
486491
if '--quiet' in f2py_flags:
487492
setup_flags.append('--quiet')
488493

‎numpy/testing/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ def decorate_methods(cls, decorator, testmatch=None):
10501050
# delayed import to reduce startup time
10511051
from inspect import isfunction
10521052

1053-
methods = list(filter(isfunction, cls_attr.values()))
1053+
methods = [_m for _m in cls_attr.values() if isfunction(_m)]
10541054
for function in methods:
10551055
try:
10561056
if hasattr(function, 'compat_func_name'):

0 commit comments

Comments
 (0)
0