Patch to provide SFTP support for Zope.

zopefoundation · May 8, 2005 · 1e2411e · 1e2411e
1 parent 78dbf48
commit 1e2411e
Show file tree

Hide file tree

Showing 22 changed files with 895 additions and 280 deletions.
diff --git a/configure.zcml b/configure.zcml
@@ -24,8 +24,10 @@
 
   <utility
       name="FTP"
-      component=".ftp.server"
+      component=".ftp.ftpserver"
       provides=".interfaces.IServerType"
       />
 
+  <include package=".sftp" />
+
 </configure>
diff --git a/ftp/__init__.py b/ftp/__init__.py
@@ -14,8 +14,9 @@
 """FTP server factories.
 """
 
+from zope.app.server.utils import FTPRequestFactory
 from zope.app.server.server import ServerType
-from zope.app.server.ftp.server import FTPRequestFactory, FTPFactory
+from zope.app.server.ftp.server import FTPFactory
 
 def createFTPFactory(db):
     request_factory = FTPRequestFactory(db)
@@ -24,4 +25,4 @@ def createFTPFactory(db):
 
     return factory
 
-server = ServerType(createFTPFactory, 8021)
+ftpserver = ServerType(createFTPFactory, 8021)
diff --git a/ftp/ftp.py b/ftp/ftp.py
@@ -24,7 +24,7 @@
 
 from twisted.protocols import ftp
 
-from zope.app.server.ftp.publisher import PublisherFileSystem
+from zope.app.server.utils import PublisherFileSystem
 
 def ls(ls_info):
     """Formats a directory entry similarly to the 'ls' command.

diff --git a/ftp/interfaces.py b/ftp/interfaces.py