Merge branch 'release/3.0.0+repack-1'3.0.0+repack-1

1 files changed, 9 insertions, 8 deletions

diff --git a/src/engine/SCons/Tool/msvsTests.py b/src/engine/SCons/Tool/msvsTests.py
index 86df271..8c09487 100644
--- a/src/engine/SCons/Tool/msvsTests.py
+++ b/src/engine/SCons/Tool/msvsTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,8 +20,9 @@
 # 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__ = "src/engine/SCons/Tool/msvsTests.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/msvsTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
 
 import os
 import sys
@@ -623,7 +624,7 @@ class msvsTestCase(unittest.TestCase):
         tests_cmdargs = [(None,            dict.fromkeys(list_variant, '')), 
                          ('',              dict.fromkeys(list_variant, '')), 
                          (list_cmdargs[0], dict.fromkeys(list_variant, list_cmdargs[0])),
-                         (list_cmdargs,    dict(zip(list_variant, list_cmdargs)))]
+                         (list_cmdargs,    dict(list(zip(list_variant, list_cmdargs))))]
         
         # Run the test for each test case
         for param_cmdargs, expected_cmdargs in tests_cmdargs:
@@ -650,8 +651,8 @@ class msvsTestCase(unittest.TestCase):
                      'cmdargs': expected_cmdargs[variant_platform]}
             
             # Create parameter environment with final parameter dictionary
-            param_dict = dict(zip(('variant', 'runfile', 'buildtarget', 'outdir'),
-                                  [list(l) for l in zip(*param_configs)]))
+            param_dict = dict(list(zip(('variant', 'runfile', 'buildtarget', 'outdir'),
+                                  [list(l) for l in zip(*param_configs)])))
             param_dict['cmdargs'] = param_cmdargs
 
             # Hack to be able to run the test with a 'DummyEnv'
@@ -667,8 +668,8 @@ class msvsTestCase(unittest.TestCase):
             genDSP = function_test(dspfile, source, env)
         
             # Check expected result
-            self.assertListEqual(genDSP.configs.keys(), expected_configs.keys())
-            for key in genDSP.configs.keys():
+            self.assertListEqual(list(genDSP.configs.keys()), list(expected_configs.keys()))
+            for key in list(genDSP.configs.keys()):
                 self.assertDictEqual(genDSP.configs[key].__dict__, expected_configs[key])
 
 class msvs6aTestCase(msvsTestCase):
@@ -827,7 +828,7 @@ if __name__ == "__main__":
     ]
 
     for test_class in test_classes:
-        print "TEST: ", test_class.__doc__
+        print("TEST: ", test_class.__doc__)
         back_osenv = copy.deepcopy(os.environ)
         try:
             # XXX: overriding the os.environ is bad, but doing it