diff options
Diffstat (limited to 'numpy/f2py')
| -rw-r--r-- | numpy/f2py/__main__.py | 23 | ||||
| -rw-r--r-- | numpy/f2py/capi_maps.py | 8 | ||||
| -rw-r--r-- | numpy/f2py/setup.py | 30 |
3 files changed, 31 insertions, 30 deletions
diff --git a/numpy/f2py/__main__.py b/numpy/f2py/__main__.py new file mode 100644 index 000000000..11dbf5f52 --- /dev/null +++ b/numpy/f2py/__main__.py @@ -0,0 +1,23 @@ +# See http://cens.ioc.ee/projects/f2py2e/ +import os, sys +for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: + try: + i=sys.argv.index("--"+mode) + del sys.argv[i] + break + except ValueError: pass +os.environ["NO_SCIPY_IMPORT"]="f2py" +if mode=="g3-numpy": + sys.stderr.write("G3 f2py support is not implemented, yet.\\n") + sys.exit(1) +elif mode=="2e-numeric": + from f2py2e import main +elif mode=="2e-numarray": + sys.argv.append("-DNUMARRAY") + from f2py2e import main +elif mode=="2e-numpy": + from numpy.f2py import main +else: + sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") + sys.exit(1) +main() diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py index 536a576dd..6155165ba 100644 --- a/numpy/f2py/capi_maps.py +++ b/numpy/f2py/capi_maps.py @@ -178,14 +178,14 @@ if os.path.isfile('.f2py_f2cmap'): f = open('.f2py_f2cmap', 'r') d = eval(f.read(), {}, {}) f.close() - for k, d1 in d.items(): - for k1 in d1.keys(): + for k, d1 in list(d.items()): + for k1 in list(d1.keys()): d1[k1.lower()] = d1[k1] d[k.lower()] = d[k] - for k in d.keys(): + for k in list(d.keys()): if k not in f2cmap_all: f2cmap_all[k]={} - for k1 in d[k].keys(): + for k1 in list(d[k].keys()): if d[k][k1] in c2py_map: if k1 in f2cmap_all[k]: outmess("\tWarning: redefinition of {'%s':{'%s':'%s'->'%s'}}\n"%(k, k1, f2cmap_all[k][k1], d[k][k1])) diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py index a27a001a9..3e2cf6867 100644 --- a/numpy/f2py/setup.py +++ b/numpy/f2py/setup.py @@ -50,32 +50,10 @@ def configuration(parent_package='',top_path=None): if newer(__file__, target): log.info('Creating %s', target) f = open(target, 'w') - f.write('''\ -#!%s -# See http://cens.ioc.ee/projects/f2py2e/ -import os, sys -for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: - try: - i=sys.argv.index("--"+mode) - del sys.argv[i] - break - except ValueError: pass -os.environ["NO_SCIPY_IMPORT"]="f2py" -if mode=="g3-numpy": - sys.stderr.write("G3 f2py support is not implemented, yet.\\n") - sys.exit(1) -elif mode=="2e-numeric": - from f2py2e import main -elif mode=="2e-numarray": - sys.argv.append("-DNUMARRAY") - from f2py2e import main -elif mode=="2e-numpy": - from numpy.f2py import main -else: - sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") - sys.exit(1) -main() -'''%(sys.executable)) + f.write('#!%s\n' % (sys.executable)) + mainloc = os.path.join(os.path.dirname(__file__), "__main__.py") + with open(mainloc) as mf: + f.write(mf.read()) f.close() return target |