Commits

Anonymous committed 7fc9154

fix for cpp scanner (maybe)
(transplanted from c68b1a5da5ad47befc3a7e802d8ae23372f0e1a8)

  • Participants
  • Parent commits 57f2642
  • Branches python3-port

Comments (0)

Files changed (2)

File src/engine/SCons/Scanner/__init__.py

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

File src/engine/SCons/dblite.py

     def str(s): return s
 
 dblite_suffix = '.dblite'
+if bytes is not str:
+    dblite_suffix += '.p3'
 tmp_suffix = '.tmp'
 
 class dblite(object):
     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()