summaryrefslogtreecommitdiff
path: root/sqlparse/sql.py
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2009-05-06 18:50:27 +0200
committerAndi Albrecht <albrecht.andi@gmail.com>2009-05-06 18:50:27 +0200
commit01b2e8f15c57296bb14d7d56242fca641bcbcebe (patch)
tree9c07ff9aa40bb891d54ed729b403f5f4b80f88a1 /sqlparse/sql.py
parent974222bcb24a5b2bf3a0e5ecd616a2c3855e8342 (diff)
downloadsqlparse-01b2e8f15c57296bb14d7d56242fca641bcbcebe.tar.gz
* Python and PHP output filter now add a trailing whitespace.
* More test coverage.
Diffstat (limited to 'sqlparse/sql.py')
-rw-r--r--sqlparse/sql.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 5abaad0..7c607c4 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -170,9 +170,9 @@ class TokenList(Token):
If no matching token can be found ``None`` is returned.
"""
- if type(clss) not in (types.ListType, types.TupleType):
+ if isinstance(clss, (list, tuple)):
clss = (clss,)
- if type(clss) is not types.TupleType:
+ if isinstance(clss, tuple):
clss = tuple(clss)
for token in self.tokens[idx:]:
if isinstance(token, clss):
@@ -181,7 +181,7 @@ class TokenList(Token):
def token_next_by_type(self, idx, ttypes):
"""Returns next matching token by it's token type."""
- if not isinstance(ttypes, (types.TupleType, types.ListType)):
+ if not isinstance(ttypes, (list, tuple)):
ttypes = [ttypes]
for token in self.tokens[idx:]:
if token.ttype in ttypes: