No new functionality - just merge the sftp package into the ftp direc…

…tory.

configure.zcml

@@ -22,12 +22,6 @@
       provides=".interfaces.IServerType"
       />
 
-  <utility
-      name="FTP"
-      component=".ftp.ftpserver"
-      provides=".interfaces.IServerType"
-      />
-
-  <include package=".sftp" />
+  <include package=".ftp" />
 
 </configure>

ftp/__init__.py

@@ -11,12 +11,14 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""FTP server factories.
+"""FTP and SFTP server factories.
 """
 
 from zope.app.server.utils import FTPRequestFactory
 from zope.app.server.server import ServerType
 from zope.app.server.ftp.server import FTPFactory
+from zope.app.server.server import SSHServerType
+from sftpserver import SFTPFactory
 
 def createFTPFactory(db):
     request_factory = FTPRequestFactory(db)
@@ -26,3 +28,16 @@ def createFTPFactory(db):
     return factory
 
 ftpserver = ServerType(createFTPFactory, 8021)
+
+
+def createSFTPFactory(db, hostkey):
+    """
+    Note that all SSH factories must contain the extra hostkey arguement.
+    """
+    request_factory = FTPRequestFactory(db)
+
+    factory = SFTPFactory(request_factory, hostkey = hostkey)
+
+    return factory
+
+sftpserver = SSHServerType(createSFTPFactory, 8115)

sftp/configure.zcml → ftp/configure.zcml

@@ -6,9 +6,14 @@
      provides="..interfaces.IServerType"
      />
 
+  <utility
+     name="FTP"
+     component=".ftpserver"
+     provides="..interfaces.IServerType"/>
+
   <adapter
      factory=".sftp.SFTPServerForZope"
-     for=".server.ZopeAvatar"
+     for=".sftpserver.ZopeAvatar"
      provides="twisted.conch.ssh.filetransfer.ISFTPServer"
      />
 

sftp/server.py → ftp/sftpserver.py

@@ -33,9 +33,12 @@
     from twisted.conch.ssh.keys import getPublicKeyString, \
          getPrivateKeyObject, objectType
 except ImportError, e:
-    SSHFactory = object
+    SSHFactory = object # so we can create the SFTPFactory
+    class SSHFactory(object):
+        def doStart(self):
+            raise ImportError, \
+                  "Please install pycrypto to run the SFTP server."
     SSHUserAuthServer = None
-    getPublicKeyString = getPrivateKeyObject = objectType = None
 from twisted.conch.avatar import ConchUser
 from twisted.conch.interfaces import IConchUser
 
@@ -164,8 +167,8 @@ def __init__(self, request_factory, hostkey):
           <type 'tuple'>
           >>> db.close()
 
-        The result variable should be the return value of the 'requestAvatar' method
-        of the SFTPRealm method. This method contains its own test.
+        The result variable should be the return value of the 'requestAvatar'
+        method of the SFTPRealm method. This method contains its own test.
         """
         self.hostkey = hostkey