[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server/POP3 - POP3Server.py:1.1.2.3 POP3ServerChannel.py:1.1.2.3

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/Server/POP3
In directory cvs.zope.org:/tmp/cvs-serv18340/POP3

Modified Files:
      Tag: Zope3-Server-Branch
	POP3Server.py POP3ServerChannel.py 
Log Message:
- Removed AlternateSocketMapMixin.  It was there to support multiple socket
maps, but if we really need multiple socket maps, it would be better to
change asyncore.  Had to update a lot of __init__ methods.

- Added IUsernamePassword and IFilesystemAccess, which provide a way to
implement all kinds of authentication schemes without FTP knowing about
any of the details.  Modified FTPServerChannel to work based on an
IFilesystemAccess object.

- Added detection of the ZOPE_SERVER_DEBUG env var.

- Added comments here and there.

- Fixed CRs :-)


=== Zope3/lib/python/Zope/Server/POP3/POP3Server.py 1.1.2.2 => 1.1.2.3 ===
 
     def __init__(self, ip, port, maildir, auth, task_dispatcher=None,
-                 adj=None, start=1, hit_log=None, verbose=0,
-                 socket_map=None):
+                 adj=None, start=1, hit_log=None, verbose=0):
 
         self.auth_source = auth
         self.maildir = UnixFileSystem(maildir)
 
         super(POP3Server, self).__init__(ip, port, task_dispatcher,
-                                         adj, start, hit_log,
-                                         verbose, socket_map)
+                                         adj, start, hit_log, verbose)
 
 
 if __name__ == '__main__':


=== Zope3/lib/python/Zope/Server/POP3/POP3ServerChannel.py 1.1.2.2 => 1.1.2.3 ===
                  'UIDL [MESG-INDEX', 'USER MAILBOX')
 
-    def __init__(self, server, conn, addr, adj=None, socket_map=None):
-        super(POP3ServerChannel, self).__init__(server, conn, addr,
-                                               adj, socket_map)
+    def __init__(self, server, conn, addr, adj=None):
+        super(POP3ServerChannel, self).__init__(server, conn, addr, adj)
 
         self.username = ''
         self.password = ''