Sql.py match and test_tokenize updates for kw change

vmuriart · vmuriart · commit 78b0fe0cd5b2 · 2016-07-02T21:08:58.000-07:00
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -71,7 +71,7 @@ def match(self, ttype, values, regex=False):
         If *regex* is ``True`` (default is ``False``) the given values are
         treated as regular expressions.
         """
-        type_matched = self.ttype is ttype
+        type_matched = self.ttype in ttype
         if not type_matched or values is None:
             return type_matched
 
diff --git a/tests/test_tokenize.py b/tests/test_tokenize.py
@@ -148,7 +148,7 @@ def test_stream_error():
 def test_parse_join(expr):
     p = sqlparse.parse('{0} foo'.format(expr))[0]
     assert len(p.tokens) == 3
-    assert p.tokens[0].ttype is T.Keyword
+    assert p.tokens[0].ttype is T.Keyword.Join
 
 
 @pytest.mark.parametrize('s', ['END IF', 'END   IF', 'END\t\nIF',
