Misc. small code clean-up/comments

vmuriart · vmuriart · commit 581912d36e2b · 2016-06-18T18:01:40.000-07:00
diff --git a/sqlparse/cli.py b/sqlparse/cli.py
@@ -134,6 +134,7 @@ def main(args=None):
         data = sys.stdin.read()
     else:
         try:
+            # TODO: Needs to deal with encoding
             data = ''.join(open(args.filename).readlines())
         except IOError as e:
             _error('Failed to read %s: %s' % (args.filename, e))
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -217,14 +217,13 @@ def post(tlist, pidx, tidx, nidx):
 
 def group_identifier_list(tlist):
     m_role = T.Keyword, ('null', 'role')
-    m_comma = T.Punctuation, ','
     sqlcls = (sql.Function, sql.Case, sql.Identifier, sql.Comparison,
               sql.IdentifierList, sql.Operation)
     ttypes = (T_NUMERICAL + T_STRING + T_NAME +
               (T.Keyword, T.Comment, T.Wildcard))
 
     def match(token):
-        return imt(token, m=m_comma)
+        return token.match(T.Punctuation, ',')
 
     def valid(token):
         return imt(token, i=sqlcls, m=m_role, t=ttypes)
@@ -275,7 +274,7 @@ def group_aliased(tlist):
     tidx, token = tlist.token_next_by(i=I_ALIAS, t=T.Number)
     while token:
         nidx, next_ = tlist.token_next(tidx)
-        if imt(next_, i=sql.Identifier):
+        if isinstance(next_, sql.Identifier):
             tlist.group_tokens(sql.Identifier, tidx, nidx, extend=True)
         tidx, token = tlist.token_next_by(i=I_ALIAS, t=T.Number, idx=tidx)
 
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
@@ -20,7 +20,7 @@
 
 class Lexer(object):
     """Lexer
-    Empty class. Leaving for back-support
+    Empty class. Leaving for backwards-compatibility
     """
 
     @staticmethod
