Include patches from extras/py3k/fixes.diff (fixes issue12).

andialbrecht · andialbrecht · commit 16b9b0922231 · 2010-11-21T12:32:27.000+01:00
diff --git a/extras/py3k/Makefile b/extras/py3k/Makefile
@@ -6,7 +6,6 @@ sqlparse:
 	cp -r ../../sqlparse .
 	$(2TO3) sqlparse > sqlparse.diff
 	patch -p0 < sqlparse.diff
-	patch -p0 < fixes.diff
 
 tests:
 	cp -r ../../tests .
@@ -17,4 +16,4 @@ clean:
 	rm -rf sqlparse
 	rm -rf tests
 	rm -f sqlparse.diff
-	rm -f tests.diff
+	rm -f tests.diff
diff --git a/extras/py3k/fixes.diff b/extras/py3k/fixes.diff
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -23,16 +23,13 @@ def __init__(self, ttype, value):
         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 @@ def __init__(self, tokens=None):
         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__
