remove unnecessary sheabangs from scripts generated by end-to-end tests

12 files changed, 41 insertions, 60 deletions

diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py
index 2de2313..9ce09b9 100644
--- a/test/Builder/multi/different-environments.py
+++ b/test/Builder/multi/different-environments.py
@@ -36,15 +36,15 @@ test = TestSCons.TestSCons(match=TestSCons.match_re)
 
 _python_ = TestSCons._python_
 
-test.write('build.py', r"""#!/usr/bin/env python%s
+test.write('build.py', r"""\
 import sys
 def build(num, target, source):
     file = open(str(target), 'wb')
-    file.write('%%s\n' %% num)
+    file.write('%s\n' % num)
     for s in source:
         file.write(open(str(s), 'rb').read())
 build(sys.argv[1],sys.argv[2],sys.argv[3:])
-""" % sys.version_info[0])
+""")
 
 test.write('SConstruct', """\
 DefaultEnvironment(tools=[])
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py
index 0635bed..c4c1893 100644
--- a/test/Builder/multi/same-overrides.py
+++ b/test/Builder/multi/same-overrides.py
@@ -29,21 +29,20 @@ Verify that everything works if two multi calls have the same overrides.
 """
 
 import TestSCons
-import sys
 
 test = TestSCons.TestSCons(match=TestSCons.match_re)
 
 _python_ = TestSCons._python_
 
-test.write('build.py', r"""#!/usr/bin/env python%s
+test.write('build.py', r"""\
 import sys
 def build(num, target, source):
     file = open(str(target), 'wb')
-    file.write(bytearray('%%s\n'%% num,'utf-8'))
+    file.write(bytearray('%s\n'% num,'utf-8'))
     for s in source:
         file.write(open(str(s), 'rb').read())
 build(sys.argv[1],sys.argv[2],sys.argv[3:])
-""" % sys.version_info[0])
+""")
 
 test.write('SConstruct', """\
 DefaultEnvironment(tools=[])
diff --git a/test/ENV.py b/test/ENV.py
index 4729789..5972175 100644
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -47,12 +47,12 @@ env2.Bld(target = 'env2.out', source = 'input')
 """ % locals())
 
 test.write('build.py',
-r"""#!/usr/bin/env python%s
+r"""\
 import os
 import sys
 contents = open(sys.argv[2], 'r').read()
-open(sys.argv[1], 'w').write("build.py %%s\n%%s" %% (os.environ['X'], contents))
-""" % sys.version_info[0])
+open(sys.argv[1], 'w').write("build.py %s\n%s" % (os.environ['X'], contents))
+""")
 
 test.write('input', "input file\n")
 
diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py
index 307d6eb..946c65c 100644
--- a/test/SWIG/build-dir.py
+++ b/test/SWIG/build-dir.py
@@ -139,25 +139,26 @@ public:
 };
 """)
 
-test.write(['source', 'test.py'], """\
-#!/usr/bin/env python%s
-from __future__ import print_function
-
-import linalg
-
-
-x = linalg.Vector(5)
-print(x)
-
-x[1] = 99.5
-x[3] = 8.3
-x[4] = 11.1
-
-
-for i, v in enumerate(x):
-    print("\tx[%%d] = %%g" %% (i, v))
-
-""" % sys.version_info[0])
+## XXX: @ptomulik: looks like it was unused?
+## test.write(['source', 'test.py'], """\
+## #!/usr/bin/env python%s
+## from __future__ import print_function
+##
+## import linalg
+##
+##
+## x = linalg.Vector(5)
+## print(x)
+##
+## x[1] = 99.5
+## x[3] = 8.3
+## x[4] = 11.1
+##
+##
+## for i, v in enumerate(x):
+##     print("\tx[%%d] = %%g" %% (i, v))
+##
+## """ % sys.version_info[0])
 
 test.run(arguments = '.')
 
diff --git a/test/TEMPFILEPREFIX.py b/test/TEMPFILEPREFIX.py
index a4b25d1..c47ebc4 100644
--- a/test/TEMPFILEPREFIX.py
+++ b/test/TEMPFILEPREFIX.py
@@ -30,7 +30,6 @@ beginning of the TEMPFILE invocation of a long command line.
 """
 
 import os
-import sys
 import stat
 
 import TestSCons
@@ -38,11 +37,10 @@ import TestSCons
 test = TestSCons.TestSCons(match = TestSCons.match_re)
 
 test.write('echo.py', """\
-#!/usr/bin/env python%s
 from __future__ import print_function
 import sys
 print(sys.argv)
-""" % sys.version_info[0])
+""")
 
 echo_py = test.workpath('echo.py')
 
diff --git a/test/TEX/biber_biblatex.py b/test/TEX/biber_biblatex.py
index 42a2add..b4a4969 100755
--- a/test/TEX/biber_biblatex.py
+++ b/test/TEX/biber_biblatex.py
@@ -32,7 +32,6 @@ Test courtesy Rob Managan.
 
 import TestSCons
 import os
-import sys
 
 test = TestSCons.TestSCons()
 
@@ -50,13 +49,11 @@ if not gloss==0:
 
 
 test.write(['SConstruct'], """\
-#!/usr/bin/env python%s
-
 import os
 env = Environment(ENV=os.environ)
 env['BIBTEX'] = 'biber'
 main_output = env.PDF('bibertest.tex')
-""" % sys.version_info[0])
+""")
 
 
 sources_bib_content = r"""
diff --git a/test/TEX/biber_biblatex2.py b/test/TEX/biber_biblatex2.py
index 85a833c..e9893ee 100644
--- a/test/TEX/biber_biblatex2.py
+++ b/test/TEX/biber_biblatex2.py
@@ -34,7 +34,6 @@ Test courtesy Rob Managan.
 
 import TestSCons
 import os
-import sys
 
 test = TestSCons.TestSCons()
 
@@ -56,12 +55,10 @@ if not biblatex==0:
 
 
 test.write(['SConstruct'], """\
-#!/usr/bin/env python%s
-
 import os
 env = Environment(ENV=os.environ)
 main_output = env.PDF('bibertest.tex')
-""" % sys.version_info[0])
+""")
 
 
 sources_bib_content = r"""
diff --git a/test/TEX/biblatex.py b/test/TEX/biblatex.py
index 7b0176e..21e1a93 100755
--- a/test/TEX/biblatex.py
+++ b/test/TEX/biblatex.py
@@ -31,7 +31,6 @@ Test courtesy Rob Managan.
 """
 
 import TestSCons
-import sys
 import os
 
 test = TestSCons.TestSCons()
@@ -46,12 +45,10 @@ if not biblatex==0:
 
 
 test.write(['SConstruct'], """\
-#!/usr/bin/env python%s
-
 import os
 env = Environment(ENV=os.environ)
 main_output = env.PDF(target='biblatextest.pdf', source='biblatextest.tex')
-""" % sys.version_info[0])
+""")
 
 
 sources_bib_content = r"""
diff --git a/test/TEX/biblatex_plain.py b/test/TEX/biblatex_plain.py
index 6a20761..96a8476 100644
--- a/test/TEX/biblatex_plain.py
+++ b/test/TEX/biblatex_plain.py
@@ -46,12 +46,10 @@ if not biblatex==0:
 
 
 test.write(['SConstruct'], """\
-#!/usr/bin/env python%s
-
 import os
 env = Environment(ENV=os.environ)
 main_output = env.PDF(target='biblatextest.pdf', source='biblatextest.tex')
-""" % sys.version_info[0])
+""")
 
 test.write(['biblatextest.tex'],r"""
 \documentclass{article}
diff --git a/test/explain/basic.py b/test/explain/basic.py
index ce7c817..4dfe47b 100644
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -29,7 +29,6 @@ Verify a lot of the basic operation of the --debug=explain option.
 """
 
 import os
-import sys
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -52,7 +51,7 @@ inc_bbb_k = test.workpath('inc', 'bbb.k')
 
 
 
-test.write(cat_py, r"""#!/usr/bin/env python%s
+test.write(cat_py, r"""
 from __future__ import print_function
 
 import sys
@@ -77,7 +76,7 @@ for f in sys.argv[2:]:
         process(outfp, open(f, 'r'))
 
 sys.exit(0)
-""" % sys.version_info[0])
+""")
 
 
 SConstruct_contents = """\
diff --git a/test/srcchange.py b/test/srcchange.py
index af153db..6916d50 100644
--- a/test/srcchange.py
+++ b/test/srcchange.py
@@ -34,7 +34,6 @@ TargetSignatures('content') but we now rely on the default behavior
 being the equivalent of Decider('content').
 """
 
-import sys
 import os.path
 
 import TestSCons
@@ -44,10 +43,9 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 test.write('getrevision', """
-#!/usr/bin/env python%s
 from __future__ import print_function
 print(open('revnum.in','r').read().strip(), end='')
-""" % sys.version_info[0])
+""")
 
 test.write('SConstruct', """
 import re
diff --git a/test/subdivide.py b/test/subdivide.py
index 49e5e5d..7ddc2e9 100644
--- a/test/subdivide.py
+++ b/test/subdivide.py
@@ -36,7 +36,6 @@ being the equivalent of Decider('content').
 """
 
 import os
-import sys
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -59,22 +58,20 @@ fake_cc_py = test.workpath('fake_cc.py')
 fake_link_py = test.workpath('fake_link.py')
 
 test.write(fake_cc_py, """\
-#!/usr/bin/env python%s
 import sys
 ofp = open(sys.argv[1], 'w')
-ofp.write('fake_cc.py:  %%s\\n' %% sys.argv)
+ofp.write('fake_cc.py:  %s\\n' % sys.argv)
 for s in sys.argv[2:]:
     ofp.write(open(s, 'r').read())
-""" % sys.version_info[0])
+""")
 
 test.write(fake_link_py, """\
-#!/usr/bin/env python%s
 import sys
 ofp = open(sys.argv[1], 'w')
-ofp.write('fake_link.py:  %%s\\n' %% sys.argv)
+ofp.write('fake_link.py:  %s\\n' % sys.argv)
 for s in sys.argv[2:]:
     ofp.write(open(s, 'r').read())
-""" % sys.version_info[0])
+""")
 
 test.chmod(fake_cc_py, 0o755)
 test.chmod(fake_link_py, 0o755)