Fixed print statement to work with py2/3

4 files changed, 24 insertions, 24 deletions

diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml
index a4bbf215f..f26c17920 100644
--- a/doc/user/command-line.xml
+++ b/doc/user/command-line.xml
@@ -317,7 +317,7 @@ if not GetOption('help'):
 import os
 num_cpu = int(os.environ.get('NUM_CPU', 2))
 SetOption('num_jobs', num_cpu)
-print("running with -j", GetOption('num_jobs'))
+print("running with -j %s"%GetOption('num_jobs'))
         </file>
         <file name="foo.in">
 foo.in
@@ -1863,7 +1863,7 @@ env = Environment(variables = vars,
                   CPPDEFINES={'RELEASE_BUILD' : '${RELEASE}'})
 unknown = vars.UnknownVariables()
 if unknown:
-    print("Unknown variables:", unknown.keys())
+    print("Unknown variables: %s"%unknown.keys())
     Exit(1)
 env.Program('foo.c')
         </file>
@@ -2210,7 +2210,7 @@ prog2.c
            <file name="SConstruct" printme="1">
 prog1 = Program('prog1.c')
 Default(prog1)
-print("DEFAULT_TARGETS is", map(str, DEFAULT_TARGETS))
+print("DEFAULT_TARGETS is %s"%map(str, DEFAULT_TARGETS))
            </file>
            <file name="prog1.c">
 prog1.c
@@ -2244,10 +2244,10 @@ prog1.c
            <file name="SConstruct" printme="1">
 prog1 = Program('prog1.c')
 Default(prog1)
-print("DEFAULT_TARGETS is now", map(str, DEFAULT_TARGETS))
+print("DEFAULT_TARGETS is now %s"%map(str, DEFAULT_TARGETS))
 prog2 = Program('prog2.c')
 Default(prog2)
-print("DEFAULT_TARGETS is now", map(str, DEFAULT_TARGETS))
+print("DEFAULT_TARGETS is now %s"%map(str, DEFAULT_TARGETS))
            </file>
            <file name="prog1.c">
 prog1.c
@@ -2338,7 +2338,7 @@ else:
 prog1 = Program('prog1.c')
 Program('prog2.c')
 Default(prog1)
-print("BUILD_TARGETS is", map(str, BUILD_TARGETS))
+print ("BUILD_TARGETS is %s"%map(str, BUILD_TARGETS))
         </file>
         <file name="prog1.c">
 prog1.c
diff --git a/doc/user/environments.xml b/doc/user/environments.xml
index ae670a804..2089dfe9c 100644
--- a/doc/user/environments.xml
+++ b/doc/user/environments.xml
@@ -627,7 +627,7 @@ int main() { }
       <scons_example name="environments_ex6">
         <file name="SConstruct" printme="1">
 env = Environment()
-print("CC is:", env['CC'])
+print("CC is: %s"%env['CC'])
         </file>
       </scons_example>
 
@@ -721,7 +721,7 @@ for item in sorted(env.Dictionary().items()):
 
       <sconstruct>
 env = Environment()
-print("CC is:", env.subst('$CC'))
+print("CC is: %s"%env.subst('$CC'))
       </sconstruct>
 
       <para>
@@ -738,7 +738,7 @@ print("CC is:", env.subst('$CC'))
 
       <sconstruct>
 env = Environment(CCFLAGS = '-DFOO')
-print("CCCOM is:", env['CCCOM'])
+print("CCCOM is: %s"%env['CCCOM'])
       </sconstruct>
 
       <para>
@@ -764,7 +764,7 @@ scons: `.' is up to date.
 
       <sconstruct>
 env = Environment(CCFLAGS = '-DFOO')
-print("CCCOM is:", env.subst('$CCCOM'))
+print("CCCOM is: %s"%env.subst('$CCCOM'))
       </sconstruct>
 
       <para>
@@ -806,7 +806,7 @@ scons: `.' is up to date.
        <scons_example name="environments_missing1">
          <file name="SConstruct" printme="1">
 env = Environment()
-print("value is:", env.subst( '->$MISSING&lt;-' ))
+print("value is: %s"%env.subst( '->$MISSING&lt;-' ))
         </file>
       </scons_example>
 
@@ -834,7 +834,7 @@ print("value is:", env.subst( '->$MISSING&lt;-' ))
          <file name="SConstruct" printme="1">
 AllowSubstExceptions()
 env = Environment()
-print("value is:", env.subst( '->$MISSING&lt;-' ))
+print("value is: %s"%env.subst( '->$MISSING&lt;-' ))
         </file>
       </scons_example>
 
@@ -854,7 +854,7 @@ print("value is:", env.subst( '->$MISSING&lt;-' ))
          <file name="SConstruct" printme="1">
 AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
 env = Environment()
-print("value is:", env.subst( '->${1 / 0}&lt;-' ))
+print("value is: %s"%env.subst( '->${1 / 0}&lt;-' ))
         </file>
       </scons_example>
 
@@ -1216,7 +1216,7 @@ int main() { }
         <file name="SConstruct" printme="1">
 env = Environment()
 env.Replace(NEW_VARIABLE = 'xyzzy')
-print("NEW_VARIABLE =", env['NEW_VARIABLE'])
+print("NEW_VARIABLE = %s"%env['NEW_VARIABLE'])
         </file>
       </scons_example>
 
@@ -1251,11 +1251,11 @@ print("NEW_VARIABLE =", env['NEW_VARIABLE'])
       <scons_example name="environments_Replace2">
         <file name="SConstruct" printme="1">
 env = Environment(CCFLAGS = '-DDEFINE1')
-print("CCFLAGS =", env['CCFLAGS'])
+print("CCFLAGS = %s"%env['CCFLAGS'])
 env.Program('foo.c')
 
 env.Replace(CCFLAGS = '-DDEFINE2')
-print("CCFLAGS =", env['CCFLAGS'])
+print("CCFLAGS = %s"%env['CCFLAGS'])
 env.Program('bar.c')
         </file>
         <file name="foo.c">
@@ -1375,7 +1375,7 @@ int main() { }
         <file name="SConstruct" printme="1">
 env = Environment()
 env.Append(NEW_VARIABLE = 'added')
-print("NEW_VARIABLE =", env['NEW_VARIABLE'])
+print("NEW_VARIABLE = %s"%env['NEW_VARIABLE'])
         </file>
       </scons_example>
 
@@ -1475,7 +1475,7 @@ int main() { }
         <file name="SConstruct" printme="1">
 env = Environment()
 env.Prepend(NEW_VARIABLE = 'added')
-print("NEW_VARIABLE =", env['NEW_VARIABLE'])
+print("NEW_VARIABLE = %s"%env['NEW_VARIABLE'])
         </file>
       </scons_example>
 
diff --git a/doc/user/misc.xml b/doc/user/misc.xml
index 169063988..e390b7a5c 100644
--- a/doc/user/misc.xml
+++ b/doc/user/misc.xml
@@ -268,9 +268,9 @@ hello.c
     <scons_example name="misc_FindFile1a">
       <file name="SConstruct" printme="1">
 # one directory
-print(FindFile('missing', '.'))
+print("%s"%FindFile('missing', '.'))
 t = FindFile('exists', '.')
-print(t.__class__, t)
+print("%s %s"%(t.__class__, t))
       </file>
       <file name="exists">
  exists
@@ -287,7 +287,7 @@ print(t.__class__, t)
 includes = [ '.', 'include', 'src/include']
 headers = [ 'nonesuch.h', 'config.h', 'private.h', 'dist.h']
 for hdr in headers:
-    print('%-12s' % ('%s:' % hdr), FindFile(hdr, includes))
+    print('%-12s: %s'%(hdr, FindFile(hdr, includes)))
       </file>
       <file name="config.h">
 exists
diff --git a/doc/user/nodes.xml b/doc/user/nodes.xml
index b17bb7cf3..7d36a65b5 100644
--- a/doc/user/nodes.xml
+++ b/doc/user/nodes.xml
@@ -265,8 +265,8 @@ xyzzy = Entry('xyzzy')
       <file name="SConstruct" printme="1">
 object_list = Object('hello.c')
 program_list = Program(object_list)
-print("The object file is:", object_list[0])
-print("The program file is:", program_list[0])
+print("The object file is: %s"%object_list[0])
+print("The program file is: %s"%program_list[0])
       </file>
       <file name="hello.c">
 int main() { printf("Hello, world!\n"); }
@@ -334,7 +334,7 @@ import os.path
 program_list = Program('hello.c')
 program_name = str(program_list[0])
 if not os.path.exists(program_name):
-    print(program_name, "does not exist!")
+    print("%s does not exist!"%program_name)
       </file>
       <file name="hello.c">
 int main() { printf("Hello, world!\n"); }