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

3 files changed, 3 insertions, 43 deletions

diff --git a/extras/py3k/Makefile b/extras/py3k/Makefile
index 0f5f4b6..5c2d1eb 100644
--- 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
\ No newline at end of file
+	rm -f tests.diff
diff --git a/extras/py3k/fixes.diff b/extras/py3k/fixes.diff
deleted file mode 100644
index 10c4f57..0000000
--- a/extras/py3k/fixes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- sqlparse/sql.py~	2009-04-30 08:38:16.000000000 +0200
-+++ sqlparse/sql.py	2009-04-30 08:39:15.000000000 +0200
-@@ -23,16 +23,13 @@
-         self.ttype = ttype
- 
-     def __str__(self):
--        return str(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 str(self)
-@@ -105,11 +102,8 @@
-         self.tokens = tokens
-         Token.__init__(self, None, None)
- 
--    def __unicode__(self):
--        return ''.join(str(x) for x in self.flatten())
--
-     def __str__(self):
--        return str(self).encode('utf-8')
-+        return ''.join(str(x) for x in self.flatten())
- 
-     def _get_repr_name(self):
-         return self.__class__.__name__
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__