Trying to fix Travis build again :-(

oilshell · May 29, 2018 · 57bb691b9e1bc896e8a76a9b553c8beba0f4b8ef · 57bb691
1 parent dca4319
commit 57bb691b9e1bc896e8a76a9b553c8beba0f4b8ef
Unified Split

Showing with 4 additions and 3 deletions.

+2 −2 osh/lex_test.py

+2 −1 osh/match.py
diff --git a/osh/lex_test.py b/osh/lex_test.py
@@ -227,8 +227,8 @@ def testLookAhead(self):
        ast.token(Id.Op_LParen, '('), l.LookAhead(lex_mode_e.OUTER))


-OUTER_RE = match.CompileAll(LEXER_DEF[lex_mode_e.OUTER])
-DOUBLE_QUOTED_RE = match.CompileAll(LEXER_DEF[lex_mode_e.DQ])
+OUTER_RE = match._CompileAll(LEXER_DEF[lex_mode_e.OUTER])
+DOUBLE_QUOTED_RE = match._CompileAll(LEXER_DEF[lex_mode_e.DQ])


 class RegexTest(unittest.TestCase):
diff --git a/osh/match.py b/osh/match.py
@@ -13,7 +13,8 @@
 except ImportError:
  fastlex = None

-if fastlex:
+#if fastlex:
+if 0:
  re = None  # Shouldn't use re module in this case
 else:
  import re