Change argument order to match order of all other functions

vmuriart · vmuriart · commit 997f95b8b6ec · 2016-06-14T03:28:26.000-07:00
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -195,7 +195,8 @@ def group_comments(tlist):
     token = tlist.token_next_by(t=T.Comment)
     while token:
         end = tlist.token_not_matching(
-            tlist.token_index(token) + 1, lambda tk: imt(tk, t=T.Comment) or tk.is_whitespace())
+            lambda tk: imt(tk, t=T.Comment) or tk.is_whitespace(),
+            idx=tlist.token_index(token) + 1)
         if end is not None:
             end = tlist.token_prev(tlist.token_index(end), False)
             token = tlist.group_tokens_between(sql.Comment, token, end)
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -269,12 +269,12 @@ def token_next_by(self, i=None, m=None, t=None, idx=0, end=None):
         funcs = lambda tk: imt(tk, i, m, t)
         return self._token_matching(funcs, idx, end)
 
-    def token_not_matching(self, idx, funcs):
+    def token_not_matching(self, funcs, idx):
         funcs = (funcs,) if not isinstance(funcs, (list, tuple)) else funcs
         funcs = [lambda tk: not func(tk) for func in funcs]
         return self._token_matching(funcs, idx)
 
-    def token_matching(self, idx, funcs):
+    def token_matching(self, funcs, idx):
         return self._token_matching(funcs, idx)
 
     def token_idx_prev(self, idx, skip_ws=True):
diff --git a/tests/test_tokenize.py b/tests/test_tokenize.py
@@ -113,14 +113,12 @@ def test_token_matching(self):
         t1 = sql.Token(T.Keyword, 'foo')
         t2 = sql.Token(T.Punctuation, ',')
         x = sql.TokenList([t1, t2])
-        self.assertEqual(x.token_matching(0, [lambda t: t.ttype is T.Keyword]),
-                         t1)
         self.assertEqual(x.token_matching(
-            0,
-            [lambda t: t.ttype is T.Punctuation]),
-            t2)
-        self.assertEqual(x.token_matching(1, [lambda t: t.ttype is T.Keyword]),
-                         None)
+            [lambda t: t.ttype is T.Keyword], 0), t1)
+        self.assertEqual(x.token_matching(
+            [lambda t: t.ttype is T.Punctuation], 0), t2)
+        self.assertEqual(x.token_matching(
+            [lambda t: t.ttype is T.Keyword], 1), None)
 
 
 class TestStream(unittest.TestCase):
