Merge pull request #5565 from juliantaylor/pep338-f2py

ENH: make f2py an executable module

2 files changed, 27 insertions, 26 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/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