[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server/FTP - FTPServerChannel.py:1.1.2.10

[Shane Hathaway]

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

Modified Files:
      Tag: Zope3-Server-Branch
	FTPServerChannel.py 
Log Message:
Updated to match changes in ServerBase and DualModeChannel.


=== Zope3/lib/python/Zope/Server/FTP/FTPServerChannel.py 1.1.2.9 => 1.1.2.10 ===
         self.client_dc = None
 
-        self.transfer_mode = 'a'
+        self.transfer_mode = 'i'  # Use binary by default
         self.passive_mode = 0
         self.cwd = '/'
         self._rnfr = None
@@ -116,10 +116,7 @@
 
         elif method in fs_access_cmds:
             # Process in another thread.
-            task = self.task_class(self, command, method)
-            self.set_sync()
-            self.server.addTask(task)
-            return
+            return self.task_class(self, command, method)
 
         elif hasattr(self, method):
             getattr(self, method)(command.args)
@@ -127,8 +124,6 @@
         else:
             self.reply(500, 0, (cmd.upper()))
 
-        self.end_task(0)
-
 
     ############################################################
     # Implementation methods for interface
@@ -163,7 +158,7 @@
             self.cwd = path
             self.reply(250, 0, 'CWD')
         else:
-            self.reply (550, 1, path)
+            self.reply(550, 1, path)
 
 
     def cmd_dele(self, args):
@@ -597,6 +592,6 @@
         self.write('%i%s%s\r\n' %(code, fill, msg))
 
         if flush:
-            self.flush()
+            self.flush(0)
 
         # XXX: Some logging should go on here.