Commits

ndbe...@gmail.com  committed 11a3fc2

2 minor issues
(transplanted from 6711a6b819f61764bb82c0f32a251b91ec66a0b2)

  • Participants
  • Parent commits daaedb5
  • Branches python3-port

Comments (0)

Files changed (2)

File QMTest/TestCmd.py

+from __future__ import print_function
 """
 TestCmd.py:  a testing framework for commands and scripts.
 
             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()

File src/engine/SCons/Action.py

         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):