Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.

4 files changed, 12 insertions, 12 deletions

diff --git a/test/option/debug-count.py b/test/option/debug-count.py
index 3f8a23c0..076d7fa8 100644
--- a/test/option/debug-count.py
+++ b/test/option/debug-count.py
@@ -74,10 +74,10 @@ for args in ['-h --debug=count', '--debug=count']:
     missing = [o for o in objects if find_object_count(o, stdout) is None]
 
     if missing:
-        print "Missing the following object lines from '%s' output:" % args
-        print "\t", ' '.join(missing)
-        print "STDOUT =========="
-        print stdout
+        print("Missing the following object lines from '%s' output:" % args)
+        print("\t", ' '.join(missing))
+        print("STDOUT ==========")
+        print(stdout)
         test.fail_test(1)
 
 expect_warning = """
diff --git a/test/option/debug-time.py b/test/option/debug-time.py
index 198d71df..7448e1c0 100644
--- a/test/option/debug-time.py
+++ b/test/option/debug-time.py
@@ -20,7 +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 division
+
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -164,7 +164,7 @@ outside of the 15%% tolerance.
 """ % locals())
 
 if failures or warnings:
-    print '\n'.join([test.stdout()] + failures + warnings)
+    print('\n'.join([test.stdout()] + failures + warnings))
 if failures:
     test.fail_test(1)
 
@@ -172,7 +172,7 @@ test.run(arguments = "--debug=time . SLEEP=0")
 
 command_time = get_command_time(test.stdout())
 if command_time != 0.0:
-    print "Up-to-date run received non-zero command time of %s" % command_time
+    print("Up-to-date run received non-zero command time of %s" % command_time)
     test.fail_test()
 
 
@@ -201,14 +201,14 @@ outside of the 1%% tolerance.
 """ % locals())
 
 if failures:
-    print '\n'.join([test.stdout()] + failures)
+    print('\n'.join([test.stdout()] + failures))
     test.fail_test(1)
 
 test.run(arguments = "-j4 --debug=time . SLEEP=1")
 
 command_time = get_command_time(test.stdout())
 if command_time != 0.0:
-    print "Up-to-date run received non-zero command time of %s" % command_time
+    print("Up-to-date run received non-zero command time of %s" % command_time)
     test.fail_test()
 
 
diff --git a/test/option/help-options.py b/test/option/help-options.py
index 45bbfa0d..1b23cb34 100644
--- a/test/option/help-options.py
+++ b/test/option/help-options.py
@@ -60,8 +60,8 @@ options = [x[-1] == ',' and x[:-1] or x for x in options]
 lowered = [x.lower() for x in options]
 ordered = sorted(lowered)
 if lowered != ordered:
-    print "lowered =", lowered
-    print "sorted =", ordered
+    print("lowered =", lowered)
+    print("sorted =", ordered)
     test.fail_test()
 
 test.pass_test()
diff --git a/test/option/profile.py b/test/option/profile.py
index d53c6900..513da476 100644
--- a/test/option/profile.py
+++ b/test/option/profile.py
@@ -36,7 +36,7 @@ else:
     # when we drop support for Python 2.6.
     class StringIO(_StringIO):
         def write(self, s):
-            _StringIO.write(self, unicode(s))
+            _StringIO.write(self, str(s))
 
 import TestSCons