diff options
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/__init__.py | 12 | ||||
| -rw-r--r-- | sqlparse/engine/grouping.py | 43 | ||||
| -rw-r--r-- | sqlparse/sql.py | 6 |
3 files changed, 28 insertions, 33 deletions
diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py index 691b53f..8ab957a 100644 --- a/sqlparse/__init__.py +++ b/sqlparse/__init__.py @@ -10,11 +10,11 @@ __version__ = '0.2.0.dev0' # Setup namespace -from sqlparse import engine -from sqlparse import filters -from sqlparse import formatter +from sqlparse import engine # noqa +from sqlparse import filters # noqa +from sqlparse import formatter # noqa -from sqlparse.compat import u +from sqlparse.compat import u # noqa def parse(sql, encoding=None): @@ -69,9 +69,7 @@ def split(sql, encoding=None): return [u(stmt).strip() for stmt in stack.run(sql, encoding)] -from sqlparse.engine.filter import StatementFilter - - def split2(stream): + from sqlparse.engine.filter import StatementFilter splitter = StatementFilter() return list(splitter.process(None, stream)) diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py index 1149370..4e45f65 100644 --- a/sqlparse/engine/grouping.py +++ b/sqlparse/engine/grouping.py @@ -5,11 +5,6 @@ import itertools from sqlparse import sql from sqlparse import tokens as T -try: - next -except NameError: # Python < 2.6 - next = lambda i: i.next() - def _group_left_right(tlist, ttype, value, cls, check_right=lambda t: True, @@ -441,23 +436,23 @@ def align_comments(tlist): def group(tlist): for func in [ - group_comments, - group_brackets, - group_functions, - group_where, - group_case, - group_identifier, - group_order, - group_typecasts, - group_as, - group_aliased, - group_assignment, - group_comparison, - align_comments, - group_identifier_list, - group_if, - group_for, - group_foreach, - group_begin, - ]: + group_comments, + group_brackets, + group_functions, + group_where, + group_case, + group_identifier, + group_order, + group_typecasts, + group_as, + group_aliased, + group_assignment, + group_comparison, + align_comments, + group_identifier_list, + group_if, + group_for, + group_foreach, + group_begin, + ]: func(tlist) diff --git a/sqlparse/sql.py b/sqlparse/sql.py index 9c0497a..f357572 100644 --- a/sqlparse/sql.py +++ b/sqlparse/sql.py @@ -491,9 +491,11 @@ class Statement(TokenList): # The WITH keyword should be followed by either an Identifier or # an IdentifierList containing the CTE definitions; the actual # DML keyword (e.g. SELECT, INSERT) will follow next. - idents = self.token_next(self.token_index(first_token), skip_ws=True) + idents = self.token_next( + self.token_index(first_token), skip_ws=True) if isinstance(idents, (Identifier, IdentifierList)): - dml_keyword = self.token_next(self.token_index(idents), skip_ws=True) + dml_keyword = self.token_next( + self.token_index(idents), skip_ws=True) if dml_keyword.ttype == T.Keyword.DML: return dml_keyword.normalized # Hmm, probably invalid syntax, so return unknown. |