From 6cbaef4ba5264dce9983e21f6170727569e40e77 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Sat, 12 Jan 2019 19:33:22 +0100
Subject: [PATCH] Travis CI: Run more f-string tests on Python 3.7

---
 pytest/test_fstring.py        | 2 +-
 pytest/test_grammar.py        | 2 +-
 uncompyle6/parsers/parse34.py | 2 +-
 uncompyle6/parsers/parse35.py | 2 +-
 uncompyle6/parsers/parse36.py | 2 +-
 uncompyle6/parsers/parse37.py | 2 +-
 uncompyle6/scanners/tok.py    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pytest/test_fstring.py b/pytest/test_fstring.py
index 93518cd7..46dc45ad 100644
--- a/pytest/test_fstring.py
+++ b/pytest/test_fstring.py
@@ -144,7 +144,7 @@ if PYTHON_VERSION > 2.6:
         run_test(fstring)
 
 
-    @pytest.mark.skipif(PYTHON_VERSION != 3.6, reason='need Python 3.6')
+    @pytest.mark.skipif(PYTHON_VERSION < 3.6, reason='need Python 3.6+')
     @pytest.mark.parametrize('fstring', [
         "f'{abc}{abc!s}'",
         "f'{abc}0'",
diff --git a/pytest/test_grammar.py b/pytest/test_grammar.py
index b4a3526c..39b5e2eb 100644
--- a/pytest/test_grammar.py
+++ b/pytest/test_grammar.py
@@ -7,7 +7,7 @@ def test_grammar():
 
     def check_tokens(tokens, opcode_set):
         remain_tokens = set(tokens) - opcode_set
-        remain_tokens = set([re.sub('_\d+$','', t) for t in remain_tokens])
+        remain_tokens = set([re.sub(r'_\d+$','', t) for t in remain_tokens])
         remain_tokens = set([re.sub('_CONT$','', t) for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         assert remain_tokens == set([]), \
diff --git a/uncompyle6/parsers/parse34.py b/uncompyle6/parsers/parse34.py
index 4f512995..be6f6efe 100644
--- a/uncompyle6/parsers/parse34.py
+++ b/uncompyle6/parsers/parse34.py
@@ -84,7 +84,7 @@ if __name__ == '__main__':
             """.split()))
         remain_tokens = set(tokens) - opcode_set
         import re
-        remain_tokens = set([re.sub('_\d+$', '',  t) for t in remain_tokens])
+        remain_tokens = set([re.sub(r'_\d+$', '',  t) for t in remain_tokens])
         remain_tokens = set([re.sub('_CONT$', '', t) for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         print(remain_tokens)
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index dd5d3ce1..e33b7bf7 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -267,7 +267,7 @@ if __name__ == '__main__':
             """.split()))
         remain_tokens = set(tokens) - opcode_set
         import re
-        remain_tokens = set([re.sub('_\d+$', '', t) for t in remain_tokens])
+        remain_tokens = set([re.sub(r'_\d+$', '', t) for t in remain_tokens])
         remain_tokens = set([re.sub('_CONT$', '', t) for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         print(remain_tokens)
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index 3c72b77c..9e43b37c 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -366,7 +366,7 @@ if __name__ == '__main__':
             """.split()))
         remain_tokens = set(tokens) - opcode_set
         import re
-        remain_tokens = set([re.sub('_\d+$', '', t) for t in remain_tokens])
+        remain_tokens = set([re.sub(r'_\d+$', '', t) for t in remain_tokens])
         remain_tokens = set([re.sub('_CONT$', '', t) for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         print(remain_tokens)
diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index de5d880a..be2aa300 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -104,7 +104,7 @@ if __name__ == '__main__':
             """.split()))
         remain_tokens = set(tokens) - opcode_set
         import re
-        remain_tokens = set([re.sub('_\d+$', '', t) for t in remain_tokens])
+        remain_tokens = set([re.sub(r'_\d+$', '', t) for t in remain_tokens])
         remain_tokens = set([re.sub('_CONT$', '', t) for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         print(remain_tokens)
diff --git a/uncompyle6/scanners/tok.py b/uncompyle6/scanners/tok.py
index 6805aedc..c88c2ecd 100644
--- a/uncompyle6/scanners/tok.py
+++ b/uncompyle6/scanners/tok.py
@@ -107,7 +107,7 @@ class Token():
                         pattr = self.opc.cmp_op[self.attr]
                 # And so on. See xdis/bytecode.py get_instructions_bytes
                 pass
-        elif re.search('_\d+$', self.kind):
+        elif re.search(r'_\d+$', self.kind):
             return "%s%s%s" % (prefix, offset_opname,  argstr)
         else:
             pattr = ''