[Buildbot-commits] buildbot/buildbot/process base.py, 1.72, 1.73 builder.py, 1.40, 1.41 buildstep.py, 1.3, 1.4

[Brian Warner]

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

Modified Files:
	base.py builder.py buildstep.py 
Log Message:
[project @ get implements() from zope.interface directly, not from twcompat]

Original author: warner at lothar.com
Date: 2006-12-11 08:53:40

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- base.py	24 Nov 2006 07:16:35 -0000	1.72
+++ base.py	11 Dec 2006 09:06:34 -0000	1.73
@@ -2,12 +2,12 @@
 
 import types
 
+from zope.interface import implements
 from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.internet import reactor, defer, error
 
 from buildbot import interfaces
-from buildbot.twcompat import implements
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION
 from buildbot.status.builder import Results, BuildRequestStatus
 from buildbot.status.progress import BuildProgress
@@ -50,10 +50,7 @@
     builder = None
     startCount = 0 # how many times we have tried to start this build
 
-    if implements:
-        implements(interfaces.IBuildRequestControl)
-    else:
-        __implements__ = interfaces.IBuildRequestControl,
+    implements(interfaces.IBuildRequestControl)
 
     def __init__(self, reason, source, builderName=None):
         # TODO: remove the =None on builderName, it is there so I don't have
@@ -155,10 +152,7 @@
                         collects our status
     """
 
-    if implements:
-        implements(interfaces.IBuildControl)
-    else:
-        __implements__ = interfaces.IBuildControl,
+    implements(interfaces.IBuildControl)
 
     workdir = "build"
     build_status = None

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- builder.py	24 Nov 2006 07:19:55 -0000	1.40
+++ builder.py	11 Dec 2006 09:06:34 -0000	1.41
@@ -2,12 +2,12 @@
 
 import warnings
 
+from zope.interface import implements
 from twisted.python import log, components
 from twisted.spread import pb
 from twisted.internet import reactor, defer
 
 from buildbot import interfaces, sourcestamp
-from buildbot.twcompat import implements
 from buildbot.status.progress import Expectations
 from buildbot.util import now
 from buildbot.process import base
@@ -638,10 +638,7 @@
 
 
 class BuilderControl(components.Adapter):
-    if implements:
-        implements(interfaces.IBuilderControl)
-    else:
-        __implements__ = interfaces.IBuilderControl,
+    implements(interfaces.IBuilderControl)
 
     def requestBuild(self, req):
         """Submit a BuildRequest to this Builder."""

Index: buildstep.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/buildstep.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- buildstep.py	11 Dec 2006 08:40:17 -0000	1.3
+++ buildstep.py	11 Dec 2006 09:06:34 -0000	1.4
@@ -1,5 +1,6 @@
 # -*- test-case-name: buildbot.test.test_steps -*-
 
+from zope.interface import implements
 from twisted.internet import reactor, defer, error
 from twisted.protocols import basic
 from twisted.spread import pb
@@ -8,7 +9,6 @@
 from twisted.web.util import formatFailure
 
 from buildbot import interfaces
-from buildbot.twcompat import implements
 from buildbot import util
 from buildbot.status import progress
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, SKIPPED, \
@@ -357,10 +357,7 @@
 
 
 class LogObserver:
-    if implements:
-        implements(interfaces.ILogObserver)
-    else:
-        __implements__ = interfaces.ILogObserver,
+    implements(interfaces.ILogObserver)
 
     def setStep(self, step):
         self.step = step