From 0727ee61d6ec6eeb099b0d179fa77a1a86046ee8 Mon Sep 17 00:00:00 2001
From: ndbecker2 <ndbecker2@gmail.com>
Date: Mon, 9 Sep 2013 10:14:53 -0400
Subject: 2 minor issues (transplanted from
 6711a6b819f61764bb82c0f32a251b91ec66a0b2)

---
 QMTest/TestCmd.py          | 3 ++-
 src/engine/SCons/Action.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 4f08d1f..26401ad 100644
--- a/QMTest/TestCmd.py
+++ b/QMTest/TestCmd.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 """
 TestCmd.py:  a testing framework for commands and scripts.
 
@@ -950,7 +951,7 @@ class TestCmd(object):
             condition = self.condition
         if self._preserve[condition]:
             for dir in self._dirlist:
-                print(str("Preserved directory " + dir + "\n"), end=' ')
+                print("Preserved directory " + dir + "\n", end=' ')
         else:
             list = self._dirlist[:]
             list.reverse()
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index 68c93b4..7a97dae 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -446,7 +446,7 @@ class ActionBase(object):
         vl = self.get_varlist(target, source, env)
         if is_String(vl): vl = (vl,)
         for v in vl:
-            result.append(bytes(env.subst('${'+v+'}'), 'utf-8'))
+            result.append(SCons.Util.to_bytes(env.subst('${'+v+'}')))
         return b''.join(result)
 
     def __add__(self, other):
-- 
cgit v0.12