Merged revisions 1582-1665 via svnmerge from

[scons.git] / test / Fortran / SHF77COM.py

diff --git a/test/Fortran/SHF77COM.py b/test/Fortran/SHF77COM.py
index fa024875d81415413e31f517080434e46b6b9692..75192dfe97b88b9c15e1a2f04ee7f2e25d15bbb4 100644 (file)
--- a/test/Fortran/SHF77COM.py
+++ b/test/Fortran/SHF77COM.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _obj   = TestSCons._shobj
 
 test = TestSCons.TestSCons()
@@ -50,10 +50,10 @@ sys.exit(0)
 
 
 test.write('SConstruct', """
-env = Environment(SHF77COM = r'%s myfortran.py f77 $TARGET $SOURCES',
-                  SHF77PPCOM = r'%s myfortran.py f77pp $TARGET $SOURCES',
-                  SHFORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
-                  SHFORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env = Environment(SHF77COM = r'%(_python_)s myfortran.py f77 $TARGET $SOURCES',
+                  SHF77PPCOM = r'%(_python_)s myfortran.py f77pp $TARGET $SOURCES',
+                  SHFORTRANCOM = r'%(_python_)s myfortran.py fortran $TARGET $SOURCES',
+                  SHFORTRANPPCOM = r'%(_python_)s myfortran.py fortranpp $TARGET $SOURCES')
 env.SharedObject(target = 'test01', source = 'test01.f')
 env.SharedObject(target = 'test02', source = 'test02.F')
 env.SharedObject(target = 'test03', source = 'test03.for')
@@ -68,8 +68,8 @@ env.SharedObject(target = 'test11', source = 'test11.f90')
 env.SharedObject(target = 'test12', source = 'test12.F90')
 env.SharedObject(target = 'test13', source = 'test13.f95')
 env.SharedObject(target = 'test14', source = 'test14.F95')
-env2 = Environment(SHF77COM = r'%s myfortran.py f77 $TARGET $SOURCES',
-                   SHF77PPCOM = r'%s myfortran.py f77pp $TARGET $SOURCES')
+env2 = Environment(SHF77COM = r'%(_python_)s myfortran.py f77 $TARGET $SOURCES',
+                   SHF77PPCOM = r'%(_python_)s myfortran.py f77pp $TARGET $SOURCES')
 env2.SharedObject(target = 'test21', source = 'test21.f')
 env2.SharedObject(target = 'test22', source = 'test22.F')
 env2.SharedObject(target = 'test23', source = 'test23.for')
@@ -80,7 +80,7 @@ env2.SharedObject(target = 'test27', source = 'test27.fpp')
 env2.SharedObject(target = 'test28', source = 'test28.FPP')
 env2.SharedObject(target = 'test29', source = 'test29.f77')
 env2.SharedObject(target = 'test30', source = 'test30.F77')
-""" % (python, python, python, python, python, python))
+""" % locals())
 
 test.write('test01.f',   "This is a .f file.\n#fortran\n")
 test.write('test02.F',   "This is a .F file.\n#fortranpp\n")