diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 13:56:11 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 13:56:11 -0700 |
commit | 0e4e5084e1e4a2fb369db5b4f43c500c3a9cbcd8 (patch) | |
tree | 79423482132013ee207f232db2362388f79234cf | |
parent | 9a73697c70e667c4655a01d3f76e5a9e850f1798 (diff) | |
download | numpy-0e4e5084e1e4a2fb369db5b4f43c500c3a9cbcd8.tar.gz |
BUG: Fix `not a in ...` to `a not in ...`.
Also break regular expression compiles out of the loop.
-rwxr-xr-x | numpy/f2py/f2py2e.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py index 18402ced4..7623ebf72 100755 --- a/numpy/f2py/f2py2e.py +++ b/numpy/f2py/f2py2e.py @@ -430,14 +430,15 @@ def run_compile(): remove_build_dir = 1 build_dir = os.path.join(tempfile.mktemp()) - sysinfo_flags = [_m for _m in sys.argv[1] if re.compile(r'[-][-]link[-]').match(_m)] - sys.argv = [_m for _m in sys.argv if not _m in sysinfo_flags] + _reg1 = re.compile(r'[-][-]link[-]') + sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)] + sys.argv = [_m for _m in sys.argv if _m not in sysinfo_flags] if sysinfo_flags: sysinfo_flags = [f[7:] for f in sysinfo_flags] - f2py_flags = [_m for _m in sys.argv[1:] if - re.compile(r'[-][-]((no[-]|)(wrap[-]functions|lower)|debug[-]capi|quiet)|[-]include').match(_m)] - sys.argv = [_m for _m in sys.argv if not _m in f2py_flags] + _reg2 = re.compile(r'[-][-]((no[-]|)(wrap[-]functions|lower)|debug[-]capi|quiet)|[-]include') + f2py_flags = [_m for _m in sys.argv[1:] if _reg2.match(_m)] + sys.argv = [_m for _m in sys.argv if _m not in f2py_flags] f2py_flags2 = [] fl = 0 for a in sys.argv[1:]: @@ -452,12 +453,12 @@ def run_compile(): f2py_flags.extend(f2py_flags2) sys.argv = [_m for _m in sys.argv if _m not in f2py_flags2] - flib_flags = [_m for _m in sys.argv[1:] if - re.compile(r'[-][-]((f(90)?compiler([-]exec|)|compiler)=|help[-]compiler)').match(_m)] - sys.argv = [_m for _m in sys.argv if not _m in flib_flags] - fc_flags = [_m for _m in sys.argv[1:] if - re.compile(r'[-][-]((f(77|90)(flags|exec)|opt|arch)=|(debug|noopt|noarch|help[-]fcompiler))').match(_m)] - sys.argv = [_m for _m in sys.argv if not _m in fc_flags] + _reg3 = re.compile(r'[-][-]((f(90)?compiler([-]exec|)|compiler)=|help[-]compiler)') + flib_flags = [_m for _m in sys.argv[1:] if _reg3.match(_m)] + sys.argv = [_m for _m in sys.argv if _m not in flib_flags] + _reg4 = re.compile(r'[-][-]((f(77|90)(flags|exec)|opt|arch)=|(debug|noopt|noarch|help[-]fcompiler))') + fc_flags = [_m for _m in sys.argv[1:] if _reg4.match(_m)] + sys.argv = [_m for _m in sys.argv if _m not in fc_flags] if 1: del_list = [] @@ -484,9 +485,9 @@ def run_compile(): del flib_flags[i] assert len(flib_flags)<=2,`flib_flags` - setup_flags = [_m for _m in sys.argv[1:] if - re.compile(r'[-][-](verbose)').match(_m)] - sys.argv = [_m for _m in sys.argv if not _m in setup_flags] + _reg5 = re.compile(r'[-][-](verbose)') + setup_flags = [_m for _m in sys.argv[1:] if _reg5.match(_m)] + sys.argv = [_m for _m in sys.argv if _m not in setup_flags] if '--quiet' in f2py_flags: setup_flags.append('--quiet') |