Ticket #5831: implementer-application.patch

twisted/application/reactors.py

@@ -7 +7 @@
 them.
 """
 
-from zope.interface import Interface, Attribute, implementer
+from zope.interface import Interface, Attribute, implements
 
 from twisted.plugin import IPlugin, getPlugins
 from twisted.python.reflect import namedAny
@@ -41 +41 @@
     """
 
 
-@implementer(IPlugin, IReactorInstaller)
 class Reactor(object):
     """
     @ivar moduleName: The fully-qualified Python name of the module of which
     the install callable is an attribute.
     """
+    implements(IPlugin, IReactorInstaller)
 
 
     def __init__(self, shortName, moduleName, description):

twisted/application/service.py

@@ -13 +13 @@
 Maintainer: Moshe Zadka
 """
 
-from zope.interface import implementer, Interface, Attribute
+from zope.interface import implements, Interface, Attribute
 
 from twisted.python.reflect import namedAny
 from twisted.python import components
@@ -56 +56 @@
 
 
 
-@implementer(IPlugin, IServiceMaker)
 class ServiceMaker(object):
     """
     Utility class to simplify the definition of L{IServiceMaker} plugins.
     """
+    implements(IPlugin, IServiceMaker)
 
     def __init__(self, name, module, description, tapname):
         self.name = name
@@ -152 +152 @@
         """
 
 
-@implementer(IService)
 class Service:
     """
     Base class for services.
@@ -162 +161 @@
     as not serializing this book-keeping information.
     """
 
+    implements(IService)
+
     running = 0
     name = None
     parent = None
@@ -253 +254 @@
 
 
 
-@implementer(IServiceCollection)
 class MultiService(Service):
     """
     Straightforward Service Container.
@@ -264 +264 @@
     will finish.
     """
 
+    implements(IServiceCollection)
+
     def __init__(self):
         self.services = []
         self.namedServices = {}
@@ -345 +347 @@
 
 
 
-@implementer(IProcess)
 class Process:
     """
     Process running parameters.
@@ -353 +354 @@
     Sets up uid/gid in the constructor, and has a default
     of C{None} as C{processName}.
     """
+    implements(IProcess)
     processName = None
 
     def __init__(self, uid=None, gid=None):

twisted/application/test/test_internet.py

@@ -6 +6 @@
 """
 
 
-from zope.interface import implementer
+from zope.interface import implements
 from zope.interface.verify import verifyClass
 
 from twisted.internet.protocol import Factory
@@ -15 +15 @@
 from twisted.internet.interfaces import IStreamServerEndpoint, IListeningPort
 from twisted.internet.defer import Deferred, CancelledError
 
-@implementer(IStreamServerEndpoint)
 class FakeServer(object):
     """
     In-memory implementation of L{IStreamServerEndpoint}.
@@ -37 +36 @@
         returned from C{listen} before it is returned.
     """
 
+    implements(IStreamServerEndpoint)
+
     result = None
     factory = None
     failImmediately = None
@@ -83 +84 @@
 
 
 
-@implementer(IListeningPort)
 class FakePort(object):
     """
     Fake L{IListeningPort} implementation.
@@ -91 +91 @@
     @ivar deferred: The L{Deferred} returned by C{stopListening}.
     """
 
+    implements(IListeningPort)
+
     deferred = None
 
     def stopListening(self):