Do the type check once in Token.match.

1 files changed, 3 insertions, 4 deletions

diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index ee18d4f..2ab05b9 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -64,10 +64,9 @@ class Token(object):
         If *regex* is ``True`` (default is ``False``) the given values are
         treated as regular expressions.
         """
-        if self.ttype is not ttype:
-            return False
-        if values is None:
-            return self.ttype is ttype
+        type_matched = self.ttype in ttype
+        if not type_matched or values is None:
+            return type_matched
         if isinstance(values, basestring):
             values = set([values])
         if regex: