@@ -53,4 +53,3 @@ def split(sql):
     stack = engine.FilterStack()
     stack.split_statements = True
     return [unicode(stmt) for stmt in stack.run(sql)]
-
@@ -40,8 +40,8 @@ def run(self, sql):
         stream = lexer.tokenize(sql)
         # Process token stream
         if self.preprocess:
-           for filter_ in self.preprocess:
-               stream = filter_.process(self, stream)
+            for filter_ in self.preprocess:
+                stream = filter_.process(self, stream)
 
         if (self.stmtprocess or self.postprocess or self.split_statements
             or self._grouping):
 
@@ -19,34 +19,6 @@ def process(self, stack, stream):
         raise NotImplementedError
 
 
-# FIXME: Should be removed
-def rstrip(stream):
-    buff = []
-    for token in stream:
-        if token.is_whitespace() and '\n' in token.value:
-            # assuming there's only one \n in value
-            before, rest = token.value.split('\n', 1)
-            token.value = '\n%s' % rest
-            buff = []
-            yield token
-        elif token.is_whitespace():
-            buff.append(token)
-        elif token.is_group():
-            token.tokens = list(rstrip(token.tokens))
-            # process group and look if it starts with a nl
-            if token.tokens and token.tokens[0].is_whitespace():
-                before, rest = token.tokens[0].value.split('\n', 1)
-                token.tokens[0].value = '\n%s' % rest
-                buff = []
-            while buff:
-                yield buff.pop(0)
-            yield token
-        else:
-            while buff:
-                yield buff.pop(0)
-            yield token
-
-
 # --------------------------
 # token process
 
@@ -437,4 +409,3 @@ def process(self, stack, stmt):
             varname = self.varname
         stmt.tokens = tuple(self._process(stmt.tokens, varname))
         return stmt
-
@@ -119,4 +119,3 @@ def build_filter_stack(stack, options):
 
     return stack
 
-
@@ -43,9 +43,11 @@ def apply_filters(stream, filters, lexer=None):
     a stream. If lexer is given it's forwarded to the
     filter, otherwise the filter receives `None`.
     """
+
     def _apply(filter_, stream):
         for token in filter_.filter(lexer, stream):
             yield token
+
     for filter_ in filters:
         stream = _apply(filter_, stream)
     return stream
@@ -68,16 +70,18 @@ def _process_state(cls, unprocessed, processed, state):
             if isinstance(tdef, include):
                 # it's a state reference
                 assert tdef != state, "circular state reference %r" % state
-                tokens.extend(cls._process_state(unprocessed, processed, str(tdef)))
+                tokens.extend(cls._process_state(
+                    unprocessed, processed, str(tdef)))
                 continue
 
             assert type(tdef) is tuple, "wrong rule def %r" % tdef
 
             try:
                 rex = re.compile(tdef[0], rflags).match
             except Exception, err:
-                raise ValueError("uncompilable regex %r in state %r of %r: %s" %
-                                 (tdef[0], state, cls, err))
+                raise ValueError(("uncompilable regex %r in state"
+                                  " %r of %r: %s"
+                                  % (tdef[0], state, cls, err)))
 
             assert type(tdef[1]) is _TokenType or callable(tdef[1]), \
                    'token type must be simple type or callable, not %r' % (tdef[1],)
 
@@ -201,8 +201,8 @@ def token_not_matching(self, idx, funcs):
             passed = False
             for func in funcs:
                 if func(token):
-                   passed = True
-                   break
+                    passed = True
+                    break
             if not passed:
                 return token
         return None
Original file line number	Diff line number	Diff line change
`@@ -119,4 +119,3 @@ def build_filter_stack(stack, options):`
`119`	`119`
`120`	`120`	`return stack`
`121`	`121`
`122`		`-`