[Buildbot-commits] buildbot/buildbot interfaces.py, 1.49, 1.50 twcompat.py, 1.10, 1.11

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11319/buildbot

Modified Files:
	interfaces.py twcompat.py 
Log Message:
[project @ get Interface from zope.interface directly, not from twcompat]

Original author: warner at lothar.com
Date: 2006-12-11 08:37:50

Index: interfaces.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/interfaces.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- interfaces.py	24 Nov 2006 07:19:55 -0000	1.49
+++ interfaces.py	11 Dec 2006 08:46:39 -0000	1.50
@@ -5,7 +5,7 @@
 Define the interfaces that are implemented by various buildbot classes.
 """
 
-from buildbot.twcompat import Interface
+from zope.interface import Interface
 
 # exceptions that can be raised while trying to start a build
 class NoSlaveError(Exception):

Index: twcompat.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/twcompat.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- twcompat.py	11 Dec 2006 08:40:17 -0000	1.10
+++ twcompat.py	11 Dec 2006 08:46:39 -0000	1.11
@@ -29,10 +29,9 @@
 if hasattr(components, "interface"):
     # yes
     from zope.interface import implements
-    from zope.interface import Interface
 else:
     # nope
-    from twisted.python.components import Interface
+    pass
 
 # waitForDeferred and getProcessOutputAndValue are twisted-2.0 things. If
 # we're running under 1.3, patch them into place. These versions are copied