Simplify get_tokens_str; rename get_tokens_str -> tlist2str

Use .flatten() and avoid StringIO - make the output string directly.

diff --git a/mysql2sql/print_tokens.py b/mysql2sql/print_tokens.py
index 2ed63412bfa77123038b1ea2e90c06e4353e6ad9..142391fbe05196497b25396a571072765d099ea5 100644 (file)
--- a/mysql2sql/print_tokens.py
+++ b/mysql2sql/print_tokens.py
@@ -1,12 +1,5 @@
 
 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):
@@ -14,7 +7,5 @@ def print_tokens(token_list, outfile=sys.stdout):
         outfile.write(token.normalized)
 
 
-def get_tokens_str(token_list):
-    sio = StringIO()
-    print_tokens(token_list, outfile=sio)
-    return sio.getvalue()
+def tlist2str(token_list):
+    return ''.join(token.normalized for token in token_list.flatten())

diff --git a/tests/test_tokens.py b/tests/test_tokens.py
index 1746f7beecdb6951e3dde155ffa9f95d6849c6b1..c39cd311b09c5e4b7b588101a94e7fadd3d49c3f 100755 (executable)
--- a/tests/test_tokens.py
+++ b/tests/test_tokens.py
@@ -5,7 +5,7 @@ import unittest
 from sqlparse import parse
 
 from mysql2sql.process_tokens import requote_names
-from mysql2sql.print_tokens import get_tokens_str
+from mysql2sql.print_tokens import tlist2str
 from tests import main
 
 
@@ -13,7 +13,7 @@ class TestTokens(unittest.TestCase):
     def test_requote(self):
         parsed = parse("select * from `T`")[0]
         requote_names(parsed)
-        query = get_tokens_str(parsed)
+        query = tlist2str(parsed)
         self.assertEqual(query, 'SELECT * FROM "T"')