6 files changed, 19 insertions, 18 deletions
diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index 162615b..ea22438 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
@@ -52,12 +52,13 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """\
-env = Environment(RPCGEN = r'%s myrpcgen.py', tools=['default', 'rpcgen'])
+env = Environment(RPCGEN = r'%(_python_)s myrpcgen.py',
+                  tools=['default', 'rpcgen'])
 env.RPCGenHeader('rpcif')
 env.RPCGenClient('rpcif')
 env.RPCGenService('rpcif')
 env.RPCGenXDR('rpcif')
-""" % (python,))
+""" % locals())
 
 test.write('rpcif.x', """\
 RPCGEN
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index d8ce226..66ea6df 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
@@ -52,14 +52,14 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """\
-env = Environment(RPCGEN = r'%s myrpcgen.py',
+env = Environment(RPCGEN = r'%(_python_)s myrpcgen.py',
                   RPCGENCLIENTFLAGS = '-x',
                   tools=['default', 'rpcgen'])
 env.RPCGenHeader('rpcif')
 env.RPCGenClient('rpcif')
 env.RPCGenService('rpcif')
 env.RPCGenXDR('rpcif')
-""" % (python,))
+""" % locals())
 
 test.write('rpcif.x', """\
 RPCGEN
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index 951254f..8f6cfff 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
@@ -52,14 +52,14 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """\
-env = Environment(RPCGEN = r'%s myrpcgen.py',
+env = Environment(RPCGEN = r'%(_python_)s myrpcgen.py',
                   RPCGENFLAGS = '-x',
                   tools=['default', 'rpcgen'])
 env.RPCGenHeader('rpcif')
 env.RPCGenClient('rpcif')
 env.RPCGenService('rpcif')
 env.RPCGenXDR('rpcif')
-""" % (python,))
+""" % locals())
 
 test.write('rpcif.x', """\
 RPCGEN
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index e8d3cb0..411838d 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
@@ -52,14 +52,14 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """\
-env = Environment(RPCGEN = r'%s myrpcgen.py',
+env = Environment(RPCGEN = r'%(_python_)s myrpcgen.py',
                   RPCGENHEADERFLAGS = '-x',
                   tools=['default', 'rpcgen'])
 env.RPCGenHeader('rpcif')
 env.RPCGenClient('rpcif')
 env.RPCGenService('rpcif')
 env.RPCGenXDR('rpcif')
-""" % (python,))
+""" % locals())
 
 test.write('rpcif.x', """\
 RPCGEN
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index fbc5c7f..af638ce 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
@@ -52,14 +52,14 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """\
-env = Environment(RPCGEN = r'%s myrpcgen.py',
+env = Environment(RPCGEN = r'%(_python_)s myrpcgen.py',
                   RPCGENSERVICEFLAGS = '-x',
                   tools=['default', 'rpcgen'])
 env.RPCGenHeader('rpcif')
 env.RPCGenClient('rpcif')
 env.RPCGenService('rpcif')
 env.RPCGenXDR('rpcif')
-""" % (python,))
+""" % locals())
 
 test.write('rpcif.x', """\
 RPCGEN
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index dc428a0..6ce0609 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
@@ -52,14 +52,14 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """\
-env = Environment(RPCGEN = r'%s myrpcgen.py',
+env = Environment(RPCGEN = r'%(_python_)s myrpcgen.py',
                   RPCGENXDRFLAGS = '-x',
                   tools=['default', 'rpcgen'])
 env.RPCGenHeader('rpcif')
 env.RPCGenClient('rpcif')
 env.RPCGenService('rpcif')
 env.RPCGenXDR('rpcif')
-""" % (python,))
+""" % locals())
 
 test.write('rpcif.x', """\
 RPCGEN