From 16b9b09222313e6cf45cd4daa313fd0f951f6a94 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Sun, 21 Nov 2010 12:32:27 +0100 Subject: Include patches from extras/py3k/fixes.diff (fixes issue12). --- sqlparse/sql.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sqlparse/sql.py') diff --git a/sqlparse/sql.py b/sqlparse/sql.py index a2462bc..6bf26e6 100644 --- a/sqlparse/sql.py +++ b/sqlparse/sql.py @@ -23,16 +23,13 @@ class Token(object): self.parent = None def __str__(self): - return unicode(self).encode('utf-8') + return self.value or '' 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) @@ -135,11 +132,8 @@ 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 unicode(self).encode('utf-8') + return ''.join('%s' % x for x in self.flatten()) def _get_repr_name(self): return self.__class__.__name__ -- cgit v1.2.1