fixes for print()'s for win32

2 files changed, 7 insertions, 3 deletions

diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index a4e75f3..7e1f8f1 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -233,8 +233,8 @@ def _code_contents(code):
 
     # The code contents depends on the number of local variables
     # but not their actual names.
-    contents.append("{}, {}".format(code.co_argcount, len(code.co_varnames)))
-    contents.append(", {}, {}".format(len(code.co_cellvars), len(code.co_freevars)))
+    contents.append(b"{}, {}".format(code.co_argcount, len(code.co_varnames)))
+    contents.append(b", {}, {}".format(len(code.co_cellvars), len(code.co_freevars)))
 
     # The code contents depends on any constants accessed by the
     # function. Note that we have to call _object_contents on each
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 7260071..ddafeb9 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -539,7 +539,11 @@ class Task(object):
         except ValueError:
             exc_type, exc_value = exc
             exc_traceback = None
-        raise exc_type, exc_value, exc_traceback
+        # raise exc_type, exc_value, exc_traceback
+        raise exc_type(exc_value).with_traceback(exc_traceback)
+
+        # raise e.__class__, e.__class__(e), sys.exc_info()[2]
+
 
 class AlwaysTask(Task):
     def needs_execute(self):