Merge pull request andialbrecht#65 from piranna/master

andialbrecht · andialbrecht · commit 210dce4cdf97 · 2012-04-27T22:16:30.000-07:00
parse() and parsestream() unification
diff --git a/AUTHORS b/AUTHORS
@@ -4,6 +4,5 @@ This module contains code (namely the lexer and filter mechanism) from
 the pygments project that was written by Georg Brandl.
 
 Alphabetical list of contributors:
-* Jes&uacute;s Legan&eacute;s Combarro
-
-
+* Jes&uacute;s Legan&eacute;s Combarro "Piranna" <piranna@gmail.com>
+* quest <quest@wonky.windwards.net>
diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py
@@ -26,13 +26,11 @@ def parse(sql):
 
     Returns a tuple of :class:`~sqlparse.sql.Statement` instances.
     """
-    stack = engine.FilterStack()
-    stack.full_analyze()
-    return tuple(stack.run(sql))
+    return tuple(parsestream(sql))
 
 
 def parsestream(stream):
-    """Pares sql statements from file-like object.
+    """Parse sql statements from file-like object.
 
     Returns a generator of Statement instances.
     """
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
@@ -219,7 +219,7 @@ def _stripws_parenthesis(self, tlist):
         self._stripws_default(tlist)
 
     def process(self, stack, stmt, depth=0):
-        [self.process(stack, sgroup, depth+1)
+        [self.process(stack, sgroup, depth + 1)
          for sgroup in stmt.get_sublists()]
         self._stripws(stmt)
         if depth == 0 and stmt.tokens[-1].is_whitespace():
@@ -493,6 +493,7 @@ def process(self, stack, stmt):
             res += '\n'
         return res
 
+
 def Tokens2Unicode(stream):
     result = ""
 

-Original file line number
+Diff line change
 the pygments project that was written by Georg Brandl.
 Alphabetical list of contributors:
 -* Jesús Leganés Combarro
+-
+-
 +* Jesús Leganés Combarro "Piranna" <[email protected]>
 +* quest <[email protected]>