(fixes buildbot#599) make bz2 module optional

buildbot/status/builder.py

@@ -12,7 +12,11 @@
 import gc
 from cPickle import load, dump
 from cStringIO import StringIO
-from bz2 import BZ2File
+
+try: # bz2 is not available on py23
+    from bz2 import BZ2File
+except ImportError:
+    BZ2File = None
 
 # sibling imports
 from buildbot import interfaces, util, sourcestamp
@@ -282,10 +286,11 @@ def getFile(self):
             return self.openfile
         # otherwise they get their own read-only handle
         # try a compressed log first
-        try:
-            return BZ2File(self.getFilename() + ".bz2", "r")
-        except IOError:
-            pass
+        if BZ2File is not None:
+            try:
+                return BZ2File(self.getFilename() + ".bz2", "r")
+            except IOError:
+                pass
         return open(self.getFilename(), "r")
 
     def getText(self):
@@ -444,6 +449,10 @@ def finish(self):
 
 
     def compressLog(self):
+        # bail out if there's no compression support
+        if BZ2File is None:
+            return
+
         compressed = self.getFilename() + ".bz2.tmp"
         d = threads.deferToThread(self._compressLog, compressed)
         d.addCallback(self._renameCompressedLog, compressed)