merged

1 files changed, 31 insertions, 31 deletions

diff --git a/test/toolpath/basic.py b/test/toolpath/basic.py
index e1e6f3c..eedd06e 100644
--- a/test/toolpath/basic.py
+++ b/test/toolpath/basic.py
@@ -33,63 +33,63 @@ test = TestSCons.TestSCons()
 test.write('SConstruct', """
 def foo(env):
     env['TOOL_FOO'] = 1
-    
+
 env1 = Environment(tools=[foo, 'bar'], toolpath=['tools'])
-print "env1['TOOL_FOO'] =", env1.get('TOOL_FOO')
-print "env1['TOOL_BAR'] =", env1.get('TOOL_BAR')
+print("env1['TOOL_FOO'] =", env1.get('TOOL_FOO'))
+print("env1['TOOL_BAR'] =", env1.get('TOOL_BAR'))
 
 # pick a built-in tool with pretty simple behavior
 env2 = Environment(tools=['SCCS'])
-print "env2['SCCS'] =", env2.get('SCCS')
-print "env2['TOOL_SCCS1'] =", env2.get('TOOL_SCCS1')
-print "env2['TOOL_SCCS2'] =", env2.get('TOOL_SCCS2')
+print("env2['SCCS'] =", env2.get('SCCS')
+print("env2['TOOL_SCCS1'] =", env2.get('TOOL_SCCS1'))
+print("env2['TOOL_SCCS2'] =", env2.get('TOOL_SCCS2'))
 
 env3 = Environment(tools=['SCCS'], toolpath=['.'])
-print "env3['SCCS'] =", env3.get('SCCS')
-print "env3['TOOL_SCCS1'] =", env3.get('TOOL_SCCS1')
-print "env3['TOOL_SCCS2'] =", env3.get('TOOL_SCCS2')
+print("env3['SCCS'] =", env3.get('SCCS')
+print("env3['TOOL_SCCS1'] =", env3.get('TOOL_SCCS1'))
+print("env3['TOOL_SCCS2'] =", env3.get('TOOL_SCCS2'))
 
 env4 = Environment(tools=['SCCS'], toolpath=['tools'])
-print "env4['SCCS'] =", env4.get('SCCS')
-print "env4['TOOL_SCCS1'] =", env4.get('TOOL_SCCS1')
-print "env4['TOOL_SCCS2'] =", env4.get('TOOL_SCCS2')
+print("env4['SCCS'] =", env4.get('SCCS'))
+print("env4['TOOL_SCCS1'] =", env4.get('TOOL_SCCS1'))
+print("env4['TOOL_SCCS2'] =", env4.get('TOOL_SCCS2'))
 
 env5 = Environment(tools=['SCCS'], toolpath=['tools', '.'])
-print "env5['SCCS'] =", env5.get('SCCS')
-print "env5['TOOL_SCCS1'] =", env5.get('TOOL_SCCS1')
-print "env5['TOOL_SCCS2'] =", env5.get('TOOL_SCCS2')
+print("env5['SCCS'] =", env5.get('SCCS'))
+print("env5['TOOL_SCCS1'] =", env5.get('TOOL_SCCS1'))
+print("env5['TOOL_SCCS2'] =", env5.get('TOOL_SCCS2'))
 
 env6 = Environment(tools=['SCCS'], toolpath=['.', 'tools'])
-print "env6['SCCS'] =", env6.get('SCCS')
-print "env6['TOOL_SCCS1'] =", env6.get('TOOL_SCCS1')
-print "env6['TOOL_SCCS2'] =", env6.get('TOOL_SCCS2')
+print("env6['SCCS'] =", env6.get('SCCS'))
+print("env6['TOOL_SCCS1'] =", env6.get('TOOL_SCCS1'))
+print("env6['TOOL_SCCS2'] =", env6.get('TOOL_SCCS2'))
 
 env7 = Environment(TOOLPATH="tools", tools=['SCCS'], toolpath=['$TOOLPATH'])
-print "env7['SCCS'] =", env7.get('SCCS')
-print "env7['TOOL_SCCS1'] =", env7.get('TOOL_SCCS1')
-print "env7['TOOL_SCCS2'] =", env7.get('TOOL_SCCS2')
+print("env7['SCCS'] =", env7.get('SCCS'))
+print("env7['TOOL_SCCS1'] =", env7.get('TOOL_SCCS1'))
+print("env7['TOOL_SCCS2'] =", env7.get('TOOL_SCCS2'))
 
 env8 = Environment(tools=[])
 env8.Tool('SCCS', toolpath=['tools'])
-print "env8['SCCS'] =", env8.get('SCCS')
-print "env8['TOOL_SCCS1'] =", env8.get('TOOL_SCCS1')
-print "env8['TOOL_SCCS2'] =", env8.get('TOOL_SCCS2')
+print("env8['SCCS'] =", env8.get('SCCS'))
+print("env8['TOOL_SCCS1'] =", env8.get('TOOL_SCCS1'))
+print("env8['TOOL_SCCS2'] =", env8.get('TOOL_SCCS2'))
 
 env9 = Environment(tools=[])
 Tool('SCCS', toolpath=['tools'])(env9)
-print "env9['SCCS'] =", env9.get('SCCS')
-print "env9['TOOL_SCCS1'] =", env9.get('TOOL_SCCS1')
-print "env9['TOOL_SCCS2'] =", env9.get('TOOL_SCCS2')
+print("env9['SCCS'] =", env9.get('SCCS'))
+print("env9['TOOL_SCCS1'] =", env9.get('TOOL_SCCS1'))
+print("env9['TOOL_SCCS2'] =", env9.get('TOOL_SCCS2'))
 
 env0 = Environment(TOOLPATH='tools', tools=[])
 env0.Tool('SCCS', toolpath=['$TOOLPATH'])
-print "env0['SCCS'] =", env0.get('SCCS')
-print "env0['TOOL_SCCS1'] =", env0.get('TOOL_SCCS1')
-print "env0['TOOL_SCCS2'] =", env0.get('TOOL_SCCS2')
+print("env0['SCCS'] =", env0.get('SCCS'))
+print("env0['TOOL_SCCS1'] =", env0.get('TOOL_SCCS1'))
+print("env0['TOOL_SCCS2'] =", env0.get('TOOL_SCCS2'))
 
 base = Environment(tools=[], toolpath=['tools'])
 derived = base.Clone(tools=['bar'])
-print "derived['TOOL_BAR'] =", derived.get('TOOL_BAR')
+print("derived['TOOL_BAR'] =", derived.get('TOOL_BAR'))
 """)
 
 test.write('SCCS.py', r"""\