[Buildbot-commits] buildbot/buildbot/changes base.py, 1.2, 1.3 changes.py, 1.29, 1.30 freshcvs.py, 1.22, 1.23 mail.py, 1.22, 1.23

[Brian Warner]

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

Modified Files:
	base.py changes.py freshcvs.py mail.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/changes/base.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- base.py	6 Sep 2006 00:41:54 -0000	1.2
+++ base.py	11 Dec 2006 09:06:34 -0000	1.3
@@ -1,13 +1,11 @@
 #! /usr/bin/python
 
+from zope.interface import implements
 from twisted.application import service
 
-from buildbot.twcompat import implements
 from buildbot.interfaces import IChangeSource
 from buildbot import util
 
 class ChangeSource(service.Service, util.ComparableMixin):
-    if implements:
-        implements(IChangeSource)
-    else:
-        __implements__ = IChangeSource, service.Service.__implements__
+    implements(IChangeSource)
+

Index: changes.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/changes.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- changes.py	11 Dec 2006 08:40:17 -0000	1.29
+++ changes.py	11 Dec 2006 09:06:34 -0000	1.30
@@ -8,13 +8,13 @@
 except ImportError:
     import pickle
 
+from zope.interface import implements
 from twisted.python import log
 from twisted.internet import defer
 from twisted.application import service
 from twisted.web import html
 
 from buildbot import interfaces, util
-from buildbot.twcompat import implements
 
 html_tmpl = """
 <p>Changed by: <b>%(who)s</b><br />
@@ -51,10 +51,7 @@
     chronologically increasing order. Out-of-order changes will probably
     cause the html.Waterfall display to be corrupted."""
 
-    if implements:
-        implements(interfaces.IStatusEvent)
-    else:
-        __implements__ = interfaces.IStatusEvent,
+    implements(interfaces.IStatusEvent)
 
     number = None
 

Index: freshcvs.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/freshcvs.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- freshcvs.py	25 Nov 2005 00:36:41 -0000	1.22
+++ freshcvs.py	11 Dec 2006 09:06:34 -0000	1.23
@@ -2,6 +2,7 @@
 
 import os.path
 
+from zope.interface import implements
 from twisted.cred import credentials
 from twisted.spread import pb
 from twisted.application.internet import TCPClient
@@ -9,7 +10,6 @@
 
 import cvstoys.common # to make sure VersionedPatch gets registered
 
-from buildbot.twcompat import implements
 from buildbot.interfaces import IChangeSource
 from buildbot.pbutil import ReconnectingPBClientFactory
 from buildbot.changes.changes import Change
@@ -61,10 +61,7 @@
     does not, later versions might.
     """
 
-    if implements:
-        implements(IChangeSource)
-    else:
-        __implements__ = IChangeSource, TCPClient.__implements__
+    implements(IChangeSource)
     compare_attrs = ["host", "port", "username", "password", "prefix"]
 
     changemaster = None # filled in when we're added

Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/mail.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mail.py	25 Sep 2006 06:51:36 -0000	1.22
+++ mail.py	11 Dec 2006 09:06:34 -0000	1.23
@@ -7,7 +7,6 @@
 from rfc822 import Message
 
 from buildbot import util
-from buildbot.twcompat import implements
 from buildbot.changes import base, changes, maildirtwisted
 
 def parseFreshCVSMail(self, fd, prefix=None, sep="/"):
@@ -299,12 +298,6 @@
     """This source will watch a maildir that is subscribed to a FreshCVS
     change-announcement mailing list.
     """
-    # we need our own implements() here, at least for twisted-1.3, because
-    # the double-inheritance of Service shadows __implements__ from
-    # ChangeSource.
-    if not implements:
-        __implements__ = base.ChangeSource.__implements__
-
     compare_attrs = ["basedir", "newdir", "pollinterval", "parser"]
     parser = None
     name = None