summaryrefslogtreecommitdiff
path: root/numpy/f2py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-02-28 10:58:40 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-02-28 10:58:40 -0700
commitb990ed5a18b58715fa1e13642bc7f6761e597818 (patch)
tree1c00d8287357e42d3e4cbc08291b939851ad10c1 /numpy/f2py
parent0934653e151969f6912c911b5113306bd5f450f1 (diff)
downloadnumpy-b990ed5a18b58715fa1e13642bc7f6761e597818.tar.gz
2to3: Apply `filter` fixes. Closes #3053.
Generally, this involves using list comprehension, or explicit list construction as `filter` is an iterator in Python 3.
Diffstat (limited to 'numpy/f2py')
-rwxr-xr-xnumpy/f2py/f2py2e.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
index a5935c51b..6efe00353 100755
--- a/numpy/f2py/f2py2e.py
+++ b/numpy/f2py/f2py2e.py
@@ -430,13 +430,13 @@ def run_compile():
remove_build_dir = 1
build_dir = os.path.join(tempfile.mktemp())
- sysinfo_flags = filter(re.compile(r'[-][-]link[-]').match,sys.argv[1:])
- sys.argv = filter(lambda a,flags=sysinfo_flags:a not in flags,sys.argv)
+ sysinfo_flags = list(filter(re.compile(r'[-][-]link[-]').match,sys.argv[1:]))
+ sys.argv = list(filter(lambda a,flags=sysinfo_flags:a not in flags,sys.argv))
if sysinfo_flags:
sysinfo_flags = [f[7:] for f in sysinfo_flags]
- f2py_flags = filter(re.compile(r'[-][-]((no[-]|)(wrap[-]functions|lower)|debug[-]capi|quiet)|[-]include').match,sys.argv[1:])
- sys.argv = filter(lambda a,flags=f2py_flags:a not in flags,sys.argv)
+ f2py_flags = list(filter(re.compile(r'[-][-]((no[-]|)(wrap[-]functions|lower)|debug[-]capi|quiet)|[-]include').match,sys.argv[1:]))
+ sys.argv = list(filter(lambda a,flags=f2py_flags:a not in flags,sys.argv))
f2py_flags2 = []
fl = 0
for a in sys.argv[1:]:
@@ -450,12 +450,12 @@ def run_compile():
f2py_flags2.append(':')
f2py_flags.extend(f2py_flags2)
- sys.argv = filter(lambda a,flags=f2py_flags2:a not in flags,sys.argv)
+ sys.argv = list(filter(lambda a,flags=f2py_flags2:a not in flags,sys.argv))
- flib_flags = filter(re.compile(r'[-][-]((f(90)?compiler([-]exec|)|compiler)=|help[-]compiler)').match,sys.argv[1:])
- sys.argv = filter(lambda a,flags=flib_flags:a not in flags,sys.argv)
- fc_flags = filter(re.compile(r'[-][-]((f(77|90)(flags|exec)|opt|arch)=|(debug|noopt|noarch|help[-]fcompiler))').match,sys.argv[1:])
- sys.argv = filter(lambda a,flags=fc_flags:a not in flags,sys.argv)
+ flib_flags = list(filter(re.compile(r'[-][-]((f(90)?compiler([-]exec|)|compiler)=|help[-]compiler)').match,sys.argv[1:]))
+ sys.argv = list(filter(lambda a,flags=flib_flags:a not in flags,sys.argv))
+ fc_flags = list(filter(re.compile(r'[-][-]((f(77|90)(flags|exec)|opt|arch)=|(debug|noopt|noarch|help[-]fcompiler))').match,sys.argv[1:]))
+ sys.argv = list(filter(lambda a,flags=fc_flags:a not in flags,sys.argv))
if 1:
del_list = []
@@ -481,8 +481,8 @@ def run_compile():
i = flib_flags.index(s)
del flib_flags[i]
assert len(flib_flags)<=2,`flib_flags`
- setup_flags = filter(re.compile(r'[-][-](verbose)').match,sys.argv[1:])
- sys.argv = filter(lambda a,flags=setup_flags:a not in flags,sys.argv)
+ setup_flags = list(filter(re.compile(r'[-][-](verbose)').match,sys.argv[1:]))
+ sys.argv = list(filter(lambda a,flags=setup_flags:a not in flags,sys.argv))
if '--quiet' in f2py_flags:
setup_flags.append('--quiet')