fix for cpp scanner (maybe)

(transplanted from c68b1a5da5ad47befc3a7e802d8ae23372f0e1a8)

2 files changed, 4 insertions, 2 deletions

diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index 8801094..b947961 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -394,6 +394,7 @@ class ClassicCPP(Classic):
     the contained filename in group 1.
     """
     def find_include(self, include, source_dir, path):
+        include = list (map (SCons.Util.to_str, include))
         if include[0] == '"':
             paths = (source_dir,) + tuple(path)
         else:
@@ -405,7 +406,7 @@ class ClassicCPP(Classic):
         return n, i
 
     def sort_key(self, include):
-        return SCons.Node.FS._my_normcase(' '.join(include))
+        return SCons.Node.FS._my_normcase(b' '.join(include))
 
 # Local Variables:
 # tab-width:4
diff --git a/src/engine/SCons/dblite.py b/src/engine/SCons/dblite.py
index 99af54a..4b02239 100644
--- a/src/engine/SCons/dblite.py
+++ b/src/engine/SCons/dblite.py
@@ -26,6 +26,8 @@ except NameError:
     def str(s): return s
 
 dblite_suffix = '.dblite'
+if bytes is not str:
+    dblite_suffix += '.p3'
 tmp_suffix = '.tmp'
 
 class dblite(object):
@@ -238,7 +240,6 @@ def _exercise():
     assert str(e) == "[Errno 2] No such file or directory: 'tmp.dblite'", str(e)
   else:
     raise RuntimeError("IOError expected.")
-  print("OK")
 
 if (__name__ == "__main__"):
   _exercise()