engine.SCons: More bytes/str fixes.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index d7d9afd..cec241d 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -290,7 +290,7 @@ def _function_contents(func):
         xxx = [_object_contents(x.cell_contents) for x in closure]
     except AttributeError:
         xxx = []
-    contents.append(b',(' + b','.join(xxx) + b')')
+    contents.append(b',(' + ','.join(xxx).encode('ascii') + b')')
 
     return b''.join(contents)
 
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index a537ca8..efca0c7 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -2420,7 +2420,7 @@ class File(Base):
 
     def get_contents(self):
         if not self.rexists():
-            return ''
+            return b'' # Should always be bytes
         fname = self.rfile().abspath
         try:
             contents = open(fname, "rb").read()
diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py
index aacc26d..627ff51 100644
--- a/src/engine/SCons/Tool/docbook/__init__.py
+++ b/src/engine/SCons/Tool/docbook/__init__.py
@@ -335,7 +335,7 @@ def __build_lxml(target, source, env):
         result = transform(doc)
         
     try:
-        of = open(str(target[0]), "w")
+        of = open(str(target[0]), "wb")
         of.write(of.write(etree.tostring(result, pretty_print=True)))
         of.close()
     except: