diff options
| author | William Blevins <wblevins001@gmail.com> | 2016-10-02 05:30:02 (GMT) |
|---|---|---|
| committer | William Blevins <wblevins001@gmail.com> | 2016-10-02 05:30:02 (GMT) |
| commit | 398b8988f37034f4f6e9639ede26581af7a5a2b3 (patch) | |
| tree | 84a33e83d825c2bbadeb1e67dc5ecf9b30998b69 | |
| parent | 6dd3fd8b838d18d65edd6e7adabf3a363437f8a9 (diff) | |
| download | SCons-398b8988f37034f4f6e9639ede26581af7a5a2b3.zip SCons-398b8988f37034f4f6e9639ede26581af7a5a2b3.tar.gz SCons-398b8988f37034f4f6e9639ede26581af7a5a2b3.tar.bz2 | |
Fixes for str/bytes in Scanners: resolves ~150 tests.
| -rw-r--r-- | src/engine/SCons/Scanner/__init__.py | 4 |
1 files 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 |