[pypy-commit] buildbot 0.8.4-compat: merge heads

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 0.8.4-compat
Changeset: r573:5f1209437bcd
Date: 2011-08-08 14:41 +0200
http://bitbucket.org/pypy/buildbot/changeset/5f1209437bcd/

Log:	merge heads

diff --git a/slave/buildbot.tac b/slave/buildbot.tac
--- a/slave/buildbot.tac
+++ b/slave/buildbot.tac
@@ -1,6 +1,11 @@
 # -*- mode: python -*-
 from twisted.application import service
-from buildbot.slave.bot import BuildSlave
+try:
+    # 8.x
+    from buildslave.bot import BuildSlave
+except ImportError:
+    #7.x
+    from buildbot.slave.bot import BuildSlave
 
 # ---------------------------------------------------------------
 # manual editing of the automatically generated buildbot.tac