* Python and PHP output filter now add a trailing whitespace.

* More test coverage.

3 files changed, 9 insertions, 9 deletions

diff --git a/sqlparse/filters.py b/sqlparse/filters.py
index 1ff767e..2692613 100644
--- a/sqlparse/filters.py
+++ b/sqlparse/filters.py
@@ -364,7 +364,7 @@ class OutputPythonFilter(Filter):
                 if cnt == 1:
                     continue
                 after_lb = token.value.split('\n', 1)[1]
-                yield grouping.Token(T.Text, "'")
+                yield grouping.Token(T.Text, " '")
                 yield grouping.Token(T.Whitespace, '\n')
                 for i in range(len(varname)+4):
                     yield grouping.Token(T.Whitespace, ' ')
@@ -407,11 +407,11 @@ class OutputPHPFilter(Filter):
         cnt = 0
         for token in stream:
             if token.is_whitespace() and '\n' in token.value:
-                cnt += 1
-                if cnt == 1:
-                    continue
+#                cnt += 1
+#                if cnt == 1:
+#                    continue
                 after_lb = token.value.split('\n', 1)[1]
-                yield grouping.Token(T.Text, '"')
+                yield grouping.Token(T.Text, ' "')
                 yield grouping.Token(T.Operator, ';')
                 yield grouping.Token(T.Whitespace, '\n')
                 yield grouping.Token(T.Name, varname)
diff --git a/sqlparse/formatter.py b/sqlparse/formatter.py
index 9c6f76b..b9fd891 100644
--- a/sqlparse/formatter.py
+++ b/sqlparse/formatter.py
@@ -41,7 +41,7 @@ def validate_options(options):
         options['strip_whitespace'] = True
     indent_tabs = options.get('indent_tabs', False)
     if indent_tabs not in [True, False]:
-        raise SQLParserError('Invalid value for indent_tabs: %r' % indent_tabs)
+        raise SQLParseError('Invalid value for indent_tabs: %r' % indent_tabs)
     elif indent_tabs:
         options['indent_char'] = '\t'
     else:
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 5abaad0..7c607c4 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -170,9 +170,9 @@ class TokenList(Token):
 
         If no matching token can be found ``None`` is returned.
         """
-        if type(clss) not in (types.ListType, types.TupleType):
+        if isinstance(clss, (list, tuple)):
             clss = (clss,)
-        if type(clss) is not types.TupleType:
+        if isinstance(clss, tuple):
             clss = tuple(clss)
         for token in self.tokens[idx:]:
             if isinstance(token, clss):
@@ -181,7 +181,7 @@ class TokenList(Token):
 
     def token_next_by_type(self, idx, ttypes):
         """Returns next matching token by it's token type."""
-        if not isinstance(ttypes, (types.TupleType, types.ListType)):
+        if not isinstance(ttypes, (list, tuple)):
             ttypes = [ttypes]
         for token in self.tokens[idx:]:
             if token.ttype in ttypes: