merge python3 branch to default

3 files changed, 12 insertions, 11 deletions

diff --git a/test/AddOption/basic.py b/test/AddOption/basic.py
index a1bb7b3..b1b8f2e 100644
--- a/test/AddOption/basic.py
+++ b/test/AddOption/basic.py
@@ -48,8 +48,8 @@ AddOption('--prefix',
 f = GetOption('force')
 if f:
     f = "True"
-print f
-print GetOption('prefix')
+print(f)
+print(GetOption('prefix'))
 """)
 
 test.run('-Q -q .',
diff --git a/test/AddOption/help.py b/test/AddOption/help.py
index d50e595..7b886cb 100644
--- a/test/AddOption/help.py
+++ b/test/AddOption/help.py
@@ -20,6 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -57,10 +58,10 @@ lines = test.stdout().split('\n')
 missing = [e for e in expected_lines if e not in lines]
 
 if missing:
-    print "====== STDOUT:"
-    print test.stdout()
-    print "====== Missing the following lines in the above AddOption() help output:"
-    print "\n".join(missing)
+    print("====== STDOUT:")
+    print(test.stdout())
+    print("====== Missing the following lines in the above AddOption() help output:")
+    print("\n".join(missing))
     test.fail_test()
 
 test.unlink('SConstruct')
@@ -70,10 +71,10 @@ lines = test.stdout().split('\n')
 unexpected = [e for e in expected_lines if e in lines]
 
 if unexpected:
-    print "====== STDOUT:"
-    print test.stdout()
-    print "====== Unexpected lines in the above non-AddOption() help output:"
-    print "\n".join(unexpected)
+    print("====== STDOUT:")
+    print(test.stdout())
+    print("====== Unexpected lines in the above non-AddOption() help output:")
+    print("\n".join(unexpected))
     test.fail_test()
 
 test.pass_test()
diff --git a/test/AddOption/optional-arg.py b/test/AddOption/optional-arg.py
index f976ad9..b88b796 100644
--- a/test/AddOption/optional-arg.py
+++ b/test/AddOption/optional-arg.py
@@ -43,7 +43,7 @@ AddOption('--install',
           type='string',
           metavar='DIR',
           help='installation directory')
-print GetOption('install')
+print(GetOption('install'))
 """)
 
 test.run('-Q -q',