From 398b8988f37034f4f6e9639ede26581af7a5a2b3 Mon Sep 17 00:00:00 2001 From: William Blevins Date: Sun, 2 Oct 2016 01:30:02 -0400 Subject: Fixes for str/bytes in Scanners: resolves ~150 tests. --- src/engine/SCons/Scanner/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index 5700fe9..28be642 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/engine/SCons/Scanner/__init__.py @@ -324,7 +324,7 @@ class Classic(Current): def __init__(self, name, suffixes, path_variable, regex, *args, **kw): - self.cre = re.compile(SCons.Util.to_bytes(regex), re.M) + self.cre = re.compile(regex, re.M) def _scan(node, env, path=(), self=self): node = node.rfile() @@ -405,7 +405,7 @@ class ClassicCPP(Classic): return n, i def sort_key(self, include): - return SCons.Node.FS._my_normcase(b' '.join(include)) + return SCons.Node.FS._my_normcase(' '.join(include)) # Local Variables: # tab-width:4 -- cgit v0.12