Use encoding (default is utf-8) and unicode

[sqlconvert.git] / mysql2sql / print_tokens.py

diff --git a/mysql2sql/print_tokens.py b/mysql2sql/print_tokens.py
index 2ed63412bfa77123038b1ea2e90c06e4353e6ad9..3e2b0d5cab08be97bba84a777fe52ceddb422fca 100644 (file)
--- a/mysql2sql/print_tokens.py
+++ b/mysql2sql/print_tokens.py
@@ -1,20 +1,16 @@
 
 import sys
-try:
-    from cStringIO import StringIO
-except ImportError:
-    try:
-        from StringIO import StringIO
-    except ImportError:
-        from io import StringIO
 
 
-def print_tokens(token_list, outfile=sys.stdout):
+def print_tokens(token_list, outfile=sys.stdout, encoding=None):
+    if encoding:
+        outfile = getattr(outfile, 'buffer', outfile)
     for token in token_list.flatten():
-        outfile.write(token.normalized)
+        normalized = token.normalized
+        if encoding:
+            normalized = normalized.encode(encoding)
+        outfile.write(normalized)
 
 
-def get_tokens_str(token_list):
-    sio = StringIO()
-    print_tokens(token_list, outfile=sio)
-    return sio.getvalue()
+def tlist2str(token_list):
+    return u''.join(token.normalized for token in token_list.flatten())