[Zope3-checkins] CVS: Zope3/src/zope/server/ftp - publisher.py:1.3 server.py:1.3

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/server/ftp
In directory cvs.zope.org:/tmp/cvs-serv7875/src/zope/server/ftp

Modified Files:
	publisher.py server.py 
Log Message:
Changed old-style __implements__ to new-style implements()

Also, fixed up some incorrect formatting.


=== Zope3/src/zope/server/ftp/publisher.py 1.2 => 1.3 ===
--- Zope3/src/zope/server/ftp/publisher.py:1.2	Wed Apr  9 05:49:35 2003
+++ Zope3/src/zope/server/ftp/publisher.py	Fri Jun  6 15:29:11 2003
@@ -26,12 +26,13 @@
 from zope.server.ftp.server import FTPServer
 from zope.publisher.publish import publish
 
+from zope.interface import implements
 
 class PublisherFileSystem:
     """Generic Publisher FileSystem implementation.
     """
 
-    __implements__ = IFileSystem
+    implements(IFileSystem)
 
     def __init__ (self, credentials, request_factory):
         self.credentials = credentials
@@ -143,7 +144,7 @@
 
 class PublisherFileSystemAccess:
 
-    __implements__ = IFileSystemAccess
+    implements(IFileSystemAccess)
 
     def __init__(self, request_factory):
         self.request_factory = request_factory
@@ -152,7 +153,7 @@
         # We can't actually do any authentication initially, as the
         # user may not be defined at the root.
         pass
-    
+
     def open(self, credentials):
         return PublisherFileSystem(credentials, self.request_factory)
 


=== Zope3/src/zope/server/ftp/server.py 1.2 => 1.3 ===
--- Zope3/src/zope/server/ftp/server.py:1.2	Thu Mar 13 13:49:17 2003
+++ Zope3/src/zope/server/ftp/server.py	Fri Jun  6 15:29:11 2003
@@ -29,6 +29,7 @@
 from zope.server.serverchannelbase import ChannelBaseClass
 from zope.server.buffers import OverflowableBuffer
 from zope.server.interfaces import ITask
+from zope.interface import implements
 
 status_messages = {
     'OPEN_DATA_CONN'   : '150 Opening %s mode data connection for file list',
@@ -87,7 +88,7 @@
     """The FTP Server Channel represents a connection to a particular
        client. We can therefore store information here."""
 
-    __implements__ = LineServerChannel.__implements__, IFTPCommandHandler
+    implements(IFTPCommandHandler)
 
 
     # List of commands that are always available
@@ -693,8 +694,6 @@
        It would be nice if we could make both channels the same.
        Hmmm.."""
 
-    __implements__ = asyncore.dispatcher.__implements__
-
     ready = None
 
     def __init__ (self, control_channel):
@@ -775,7 +774,7 @@
 
 class FinishedRecvTask:
 
-    __implements__ = ITask
+    implements(ITask)
 
     def __init__(self, control_channel, inbuf, finish_args):
         self.control_channel = control_channel