Fix version check when casting TokenList to string (fixes #212).

2 files changed, 12 insertions, 1 deletions

diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 323657c..c1111bb 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -157,7 +157,7 @@ class TokenList(Token):
 
     def __str__(self):
         str_ = self._to_string()
-        if sys.version_info[0] < 2:
+        if sys.version_info[0] <= 2:
             str_ = str_.encode('utf-8')
         return str_
 
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index f873c78..50592c5 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -7,6 +7,7 @@ from tests.utils import TestCaseBase, load_file
 import sqlparse
 from sqlparse import sql
 from sqlparse import tokens as T
+from sqlparse.compat import u
 
 
 class RegressionTests(TestCaseBase):
@@ -275,3 +276,13 @@ def test_issue186_get_type():
     sql = "-- comment\ninsert into foo"
     p = sqlparse.parse(sql)[0]
     assert p.get_type() == 'INSERT'
+
+
+def test_issue212_py2unicode():
+    if sys.version_info < (3,):
+        t1 = sql.Token(T.String, u"schöner ")
+    else:
+        t1 = sql.Token(T.String, "schöner ")
+    t2 = sql.Token(T.String, u"bug")
+    l = sql.TokenList([t1, t2])
+    assert str(l) == 'schöner bug'