From 718616c4123fcdac4ec2d15eed641f6f80da9600 Mon Sep 17 00:00:00 2001
From: Andi Albrecht <albrecht.andi@gmail.com>
Date: Sat, 30 Jul 2011 21:46:51 +0200
Subject: Don't write diffs when generating py3k version.

Since the diff contains non-ascii chars it causes an error on buildbot.
See http://bugs.python.org/issue7922
---
 extras/py3k/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/extras/py3k/Makefile b/extras/py3k/Makefile
index 499f2bf..57fcaeb 100644
--- a/extras/py3k/Makefile
+++ b/extras/py3k/Makefile
@@ -1,17 +1,16 @@
-2TO3=2to3-3.1
+2TO3=2to3
+2TO3OPTS=--no-diffs -w -n
 
 all: sqlparse tests
 
 sqlparse:
 	cp -r ../../sqlparse .
-	$(2TO3) sqlparse > sqlparse.diff
-	patch -p0 < sqlparse.diff
+	$(2TO3) $(2TO3OPTS) sqlparse
 	patch -p0 < fixes.diff
 
 tests:
 	cp -r ../../tests .
-	$(2TO3) tests > tests.diff
-	patch -p0 < tests.diff
+	$(2TO3) $(2TO3OPTS) tests
 
 clean:
 	rm -rf sqlparse
-- 
cgit v1.2.1