Merged

1 files changed, 8 insertions, 2 deletions

diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 6bf26e6..a2462bc 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -23,13 +23,16 @@ class Token(object):
         self.parent = None
 
     def __str__(self):
-        return self.value or ''
+        return unicode(self).encode('utf-8')
 
     def __repr__(self):
         short = self._get_repr_value()
         return '<%s \'%s\' at 0x%07x>' % (self._get_repr_name(),
                                           short, id(self))
 
+    def __unicode__(self):
+        return self.value or ''
+
     def to_unicode(self):
         """Returns a unicode representation of this object."""
         return unicode(self)
@@ -132,8 +135,11 @@ class TokenList(Token):
         self.tokens = tokens
         Token.__init__(self, None, None)
 
+    def __unicode__(self):
+        return ''.join(unicode(x) for x in self.flatten())
+
     def __str__(self):
-        return ''.join('%s' % x for x in self.flatten())
+        return unicode(self).encode('utf-8')
 
     def _get_repr_name(self):
         return self.__class__.__name__