merge with stable
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 24 Mar 2010 19:44:53 +0100
changeset 10769 d70ada7e987d
parent 10767 63c6c2d1123c (current diff)
parent 10768 95b7a15b2f05 (diff)
child 10773 bd36e5c0ccb1
child 10781 3dada86eb1e7
merge with stable
--- a/setup.py	Tue Mar 23 17:24:17 2010 -0500
+++ b/setup.py	Wed Mar 24 19:44:53 2010 +0100
@@ -27,10 +27,10 @@
         "Couldn't import standard zlib (incomplete Python install).")
 
 try:
-	import bz2
+    import bz2
 except:
-	raise SystemExit(
-		"Couldn't import standard bz2 (incomplete Python install).")
+    raise SystemExit(
+        "Couldn't import standard bz2 (incomplete Python install).")
 
 import os, subprocess, time
 import shutil