summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extras/py3k/Makefile2
-rw-r--r--extras/py3k/fixes.diff4
2 files changed, 3 insertions, 3 deletions
diff --git a/extras/py3k/Makefile b/extras/py3k/Makefile
index 694b9cd..0f5f4b6 100644
--- a/extras/py3k/Makefile
+++ b/extras/py3k/Makefile
@@ -1,4 +1,4 @@
-2TO3=2to3-3.0
+2TO3=2to3
all: sqlparse tests
diff --git a/extras/py3k/fixes.diff b/extras/py3k/fixes.diff
index fa632db..3fdefa3 100644
--- a/extras/py3k/fixes.diff
+++ b/extras/py3k/fixes.diff
@@ -15,7 +15,7 @@
self.ttype = ttype
def __str__(self):
-- return str(self).encode('latin-1')
+- return str(self).encode('utf-8')
+ return self.value or ''
def __repr__(self):
@@ -37,7 +37,7 @@
- return ''.join(str(x) for x in self.flatten())
-
def __str__(self):
-- return str(self).encode('latin-1')
+- return str(self).encode('utf-8')
+ return ''.join(str(x) for x in self.flatten())
def _get_repr_name(self):