Fix flake8 styling

5 files changed, 8 insertions, 10 deletions

diff --git a/sqlparse/engine/__init__.py b/sqlparse/engine/__init__.py
index 4d7fe88..1268bd1 100644
--- a/sqlparse/engine/__init__.py
+++ b/sqlparse/engine/__init__.py
@@ -43,8 +43,8 @@ class FilterStack(object):
             for filter_ in self.preprocess:
                 stream = filter_.process(self, stream)
 
-        if self.stmtprocess or self.postprocess or self.split_statements \
-           or self._grouping:
+        if (self.stmtprocess or self.postprocess or
+                self.split_statements or self._grouping):
             splitter = StatementFilter()
             stream = splitter.process(self, stream)
 
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index c7c0d42..7a93b5e 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -27,15 +27,16 @@ def _group_left_right(tlist, m, cls,
 
         if valid_left(left) and valid_right(right):
             if semicolon:
+                # only overwrite if a semicolon present.
                 sright = tlist.token_next_by(m=M_SEMICOLON, idx=right)
-                right = sright or right  # only overwrite if a semicolon present.
+                right = sright or right
             tokens = tlist.tokens_between(left, right)
             token = tlist.group_tokens(cls, tokens, extend=True)
         token = tlist.token_next_by(m=m, idx=token)
 
 
 def _group_matching(tlist, cls):
-    """Groups Tokens that have beginning and end. ie. parenthesis, brackets.."""
+    """Groups Tokens that have beginning and end."""
     idx = 1 if imt(tlist, i=cls) else 0
 
     token = tlist.token_next_by(m=cls.M_OPEN, idx=idx)
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 9afdac3..3177831 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -316,7 +316,7 @@ class TokenList(Token):
 
     def token_index(self, token, start=0):
         """Return list index of token."""
-        start = self.token_index(start) if not isinstance(start, int) else start
+        start = start if isinstance(start, int) else self.token_index(start)
         return start + self.tokens[start:].index(token)
 
     def tokens_between(self, start, end, include_end=True):
diff --git a/tests/test_functions.py b/tests/test_functions.py
index 9207815..fd2774e 100644
--- a/tests/test_functions.py
+++ b/tests/test_functions.py
@@ -8,9 +8,6 @@ from unittest import main, TestCase
 from sqlparse.filters import IncludeStatement, Tokens2Unicode
 from sqlparse.lexer import tokenize
 
-import sys
-sys.path.insert(0, '..')
-
 from sqlparse.filters import compact
 from sqlparse.functions import getcolumns, getlimit, IsType
 from tests.utils import FILES_DIR
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index c66a42d..13ca04b 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -7,7 +7,6 @@ from tests.utils import TestCaseBase, load_file
 import sqlparse
 from sqlparse import sql
 from sqlparse import tokens as T
-from sqlparse.compat import u
 
 
 class RegressionTests(TestCaseBase):
@@ -296,7 +295,8 @@ def test_issue213_leadingws():
 def test_issue227_gettype_cte():
     select_stmt = sqlparse.parse('SELECT 1, 2, 3 FROM foo;')
     assert select_stmt[0].get_type() == 'SELECT'
-    with_stmt = sqlparse.parse('WITH foo AS (SELECT 1, 2, 3) SELECT * FROM foo;')
+    with_stmt = sqlparse.parse('WITH foo AS (SELECT 1, 2, 3)'
+                               'SELECT * FROM foo;')
     assert with_stmt[0].get_type() == 'SELECT'
     with2_stmt = sqlparse.parse('''
         WITH foo AS (SELECT 1 AS abc, 2 AS def),