Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix token matching by always returning a tuple #748

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion sqlparse/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def _groupable_tokens(self):
def _token_matching(self, funcs, start=0, end=None, reverse=False):
"""next token that match functions"""
if start is None:
return None
return None, None

if not isinstance(funcs, (list, tuple)):
funcs = (funcs,)
Expand Down
1 change: 1 addition & 0 deletions tests/test_tokenize.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ def test_tokenlist_token_matching():
assert x.token_matching([lambda t: t.ttype is T.Keyword], 0) == t1
assert x.token_matching([lambda t: t.ttype is T.Punctuation], 0) == t2
assert x.token_matching([lambda t: t.ttype is T.Keyword], 1) is None
assert x.token_matching([lambda t: t.ttype is T.Keyword], None) is None


def test_stream_simple():
Expand Down