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

andialbrecht · andialbrecht · commit e7a40aa93ca5 · 2015-12-08T14:49:56.000+01:00
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -157,7 +157,7 @@ def __unicode__(self):
 
     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
@@ -7,6 +7,7 @@
 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&ouml;ner ")
+    else:
+        t1 = sql.Token(T.String, "sch&ouml;ner ")
+    t2 = sql.Token(T.String, u"bug")
+    l = sql.TokenList([t1, t2])
+    assert str(l) == 'sch&ouml;ner bug'
