Converted SerializerUnicode to function

2 files changed, 10 insertions, 12 deletions

diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py
index a380e33..1ff8e93 100644
--- a/sqlparse/__init__.py
+++ b/sqlparse/__init__.py
@@ -14,9 +14,8 @@ class SQLParseError(Exception):
 
 
 # Setup namespace
-from sqlparse import engine
-from sqlparse import filters
-from sqlparse import formatter
+from sqlparse         import engine, filters, formatter
+from sqlparse.filters import serializerUnicode
 
 
 def parse(sql):
@@ -49,7 +48,7 @@ def format(sql, **options):
     stack = engine.FilterStack()
     options = formatter.validate_options(options)
     stack = formatter.build_filter_stack(stack, options)
-    stack.postprocess.append(filters.SerializerUnicode())
+    stack.postprocess.append(serializerUnicode)
     return ''.join(stack.run(sql))
 
 
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
index 02562be..7efc75f 100644
--- a/sqlparse/filters.py
+++ b/sqlparse/filters.py
@@ -471,14 +471,13 @@ def columnsSelect(stream):
 # ---------------------------
 # postprocess
 
-class SerializerUnicode:
-    def __call__(self, stmt):
-        raw = unicode(stmt)
-        add_nl = raw.endswith('\n')
-        res = '\n'.join(line.rstrip() for line in raw.splitlines())
-        if add_nl:
-            res += '\n'
-        return res
+def serializerUnicode(stream):
+    raw = unicode(stream)
+    add_nl = raw.endswith('\n')
+    res = '\n'.join(line.rstrip() for line in raw.splitlines())
+    if add_nl:
+        res += '\n'
+    return res
 
 
 def Tokens2Unicode(stream):