Python 3: zope.interface.implementer

zopefoundation · Oct 21, 2017 · c32bf0a · c32bf0a
1 parent 30b5103
commit c32bf0a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/zope/app/server/ftp.py b/src/zope/app/server/ftp.py
@@ -21,6 +21,8 @@
 from zope.app.server.servertype import ServerType
 import zope.interface
 
+
+@zope.interface.implementer(IPublicationRequestFactory)
 class FTPRequestFactory(object):
     """FTP Request factory
 
@@ -39,7 +41,6 @@ class FTPRequestFactory(object):
       >>> db.close()
 
     """
-    zope.interface.implements(IPublicationRequestFactory)
 
     def __init__(self, db):
         self.publication = FTPPublication(db)

diff --git a/src/zope/app/server/servercontrol.py b/src/zope/app/server/servercontrol.py
@@ -15,13 +15,13 @@
 """
 
 from zope.app.applicationcontrol.interfaces import IServerControl
-from zope.interface import implements
+from zope.interface import implementer
 
 import zope.app.server.main
 
-class ServerControl(object):
 
-    implements(IServerControl)
+@implementer(IServerControl)
+class ServerControl(object):
 
     def shutdown(self, time=0):
         """See zope.app.applicationcontrol.interfaces.IServerControl"""

diff --git a/src/zope/app/server/servertype.py b/src/zope/app/server/servertype.py
@@ -13,7 +13,7 @@
 ##############################################################################
 """Server Type
 """
-from zope.interface import Interface, implements
+from zope.interface import Interface, implementer
 
 
 class IServerType(Interface):
@@ -29,9 +29,9 @@ def create(name, task_dispatcher, db, port=None, verbose=None, ip=None):
         Returns the new server.
         """
 
-class ServerType(object):
 
-    implements(IServerType)
+@implementer(IServerType)
+class ServerType(object):
 
     def __init__(self, factory, requestFactory, logFactory,
                  defaultPort, defaultVerbose, defaultIP=''):

diff --git a/src/zope/app/server/tests/test_server.py b/src/zope/app/server/tests/test_server.py
@@ -29,10 +29,10 @@ def doctest_ServerFactory():
 
         >>> setup.placelessSetUp()
 
-        >>> from zope.interface import implements
+        >>> from zope.interface import implementer
         >>> from zope.app.server.servertype import IServerType
-        >>> class MyServerType:
-        ...     implements(IServerType)
+        >>> @implementer(IServerType)
+        ... class MyServerType:
         ...     def create(self, name, task_dispatcher, db, port='unknown',
         ...                verbose='unspecified', ip=''):
         ...         if not ip:

diff --git a/src/zope/app/server/wsgi.py b/src/zope/app/server/wsgi.py
@@ -24,9 +24,9 @@
 
 import servertype
 
-class ServerType(object):
 
-    zope.interface.implements(servertype.IServerType)
+@zope.interface.implementer(servertype.IServerType)
+class ServerType(object):
 
     def __init__(self, factory, applicationFactory, logFactory,
                  defaultPort, defaultVerbose, defaultIP='',