[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/ disableing the SFTP server has it needs more work on its error handling

[Michael Kerrin]

Log message for revision 38930:
  disableing the SFTP server has it needs more work on its error handling
  
  I will leave the code for the SFTP server in so that I (or some one else)
  can then easily get this working.
  

Changed:
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/__init__.py
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/configure.zcml
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/tests/test_ftpserver.py

-=-
Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/__init__.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/__init__.py	2005-10-08 10:06:11 UTC (rev 38929)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/__init__.py	2005-10-08 10:23:16 UTC (rev 38930)
@@ -16,10 +16,10 @@
 
 from zope.app.twisted.server import ServerType
 from zope.app.twisted.ftp.server import FTPFactory
-from zope.app.twisted.server import SSHServerType
+## from zope.app.twisted.server import SSHServerType
 
 from utils import FTPRequestFactory
-from sftpserver import SFTPFactory
+## from sftpserver import SFTPFactory
 
 def createFTPFactory(db):
     request_factory = FTPRequestFactory(db)
@@ -31,14 +31,14 @@
 ftpserver = ServerType(createFTPFactory, 8021)
 
 
-def createSFTPFactory(db, hostkey):
-    """
-    Note that all SSH factories must contain the extra hostkey arguement.
-    """
-    request_factory = FTPRequestFactory(db)
+## 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)
+##     factory = SFTPFactory(request_factory, hostkey = hostkey)
 
-    return factory
+##     return factory
 
-sftpserver = SSHServerType(createSFTPFactory, 8115)
+## sftpserver = SSHServerType(createSFTPFactory, 8115)

Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/configure.zcml
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/configure.zcml	2005-10-08 10:06:11 UTC (rev 38929)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/configure.zcml	2005-10-08 10:23:16 UTC (rev 38930)
@@ -1,20 +1,22 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <utility
+     name="FTP"
+     component=".ftpserver"
+     provides="..interfaces.IServerType"/>
+
+<!--
+  <utility
      name="SFTP"
      component=".sftpserver"
      provides="..interfaces.IServerType"
      />
 
-  <utility
-     name="FTP"
-     component=".ftpserver"
-     provides="..interfaces.IServerType"/>
-
   <adapter
      factory=".sftp.SFTPServerForZope"
      for=".sftpserver.ZopeAvatar"
      provides="twisted.conch.ssh.filetransfer.ISFTPServer"
      />
+-->
 
 </configure>

Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/tests/test_ftpserver.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/tests/test_ftpserver.py	2005-10-08 10:06:11 UTC (rev 38929)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/ftp/tests/test_ftpserver.py	2005-10-08 10:23:16 UTC (rev 38930)
@@ -22,7 +22,7 @@
     return TestSuite((
         doctest.DocTestSuite('zope.app.twisted.ftp.server'),
         doctest.DocTestSuite('zope.app.twisted.ftp.utils'),
-        doctest.DocTestSuite('zope.app.twisted.ftp.sftpserver'),
+        ## doctest.DocTestSuite('zope.app.twisted.ftp.sftpserver'),
         ))
 
 if __name__=='__main__':