[Zope3-checkins] CVS: Zope3/src/zope/server/ftp - ftpserver.py:1.1.2.2 ftpserverchannel.py:1.1.2.2 recvchannel.py:1.1.2.3
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:52:02 -0500
Update of /cvs-repository/Zope3/src/zope/server/ftp
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/server/ftp
Modified Files:
Tag: NameGeddon-branch
ftpserver.py ftpserverchannel.py recvchannel.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/server/ftp/ftpserver.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/server/ftp/ftpserver.py:1.1.2.1 Mon Dec 23 14:33:19 2002
+++ Zope3/src/zope/server/ftp/ftpserver.py Tue Dec 24 07:51:31 2002
@@ -26,7 +26,7 @@
"""Generic FTP Server"""
channel_class = FTPServerChannel
- SERVER_IDENT = 'Zope.Server.FTPServer'
+ SERVER_IDENT = 'zope.server.ftp'
def __init__(self, ip, port, fs_access, *args, **kw):
=== Zope3/src/zope/server/ftp/ftpserverchannel.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/server/ftp/ftpserverchannel.py:1.1.2.1 Mon Dec 23 14:33:19 2002
+++ Zope3/src/zope/server/ftp/ftpserverchannel.py Tue Dec 24 07:51:31 2002
@@ -94,13 +94,8 @@
"""Open the filesystem using the current credentials."""
return self.server.fs_access.open(self.credentials)
-
- ############################################################
- # Implementation methods for interface
- # Zope.Server.FTP.IFTPCommandHandler
-
def cmd_abor(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if self.client_dc is not None:
self.client_dc.close('TRANSFER_ABORTED')
else:
@@ -108,12 +103,12 @@
def cmd_appe (self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
return self.cmd_stor(args, 'a')
def cmd_cdup(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
path = self._generatePath('../')
if self._getFilesystem().exists(path):
self.cwd = path
@@ -123,7 +118,7 @@
def cmd_cwd(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
fs = self._getFilesystem()
path = self._generatePath(args)
if fs.exists(path) and fs.isdir(path):
@@ -134,7 +129,7 @@
def cmd_dele(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if not args:
self.reply('ERR_ARGS')
return
@@ -149,14 +144,14 @@
def cmd_help(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.reply('HELP_START')
self.write('Help goes here somewhen.\r\n')
self.reply('HELP_END')
def cmd_list(self, args, long=1):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
fs = self._getFilesystem()
path = self._generatePath(args)
if not fs.exists(path):
@@ -179,7 +174,7 @@
def cmd_mdtm(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
fs = self._getFilesystem()
# We simply do not understand this non-standard extension to MDTM
if len(args.split()) > 1:
@@ -196,7 +191,7 @@
def cmd_mkd(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if not args:
self.reply('ERR_ARGS')
return
@@ -210,7 +205,7 @@
def cmd_mode(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if len(args) == 1 and args in 'sS':
self.reply('MODE_OK')
else:
@@ -218,17 +213,17 @@
def cmd_nlst(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.cmd_list(args, 0)
def cmd_noop(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.reply('SUCCESS_200', 'NOOP')
def cmd_pass(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.authenticated = 0
password = args
credentials = UsernamePassword(self.username, password)
@@ -244,7 +239,7 @@
def cmd_pasv(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
pc = self.newPassiveAcceptor()
self.client_dc = None
port = pc.addr[1]
@@ -255,7 +250,7 @@
def cmd_port(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
info = args.split(',')
ip = '.'.join(info[:4])
port = int(info[4])*256 + int(info[5])
@@ -268,18 +263,18 @@
def cmd_pwd(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.reply('ALREADY_CURRENT', self.cwd)
def cmd_quit(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.reply('GOODBYE')
self.close_when_done()
def cmd_retr(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
fs = self._getFilesystem()
if not args:
self.reply('CMD_UNKNOWN', 'RETR')
@@ -311,7 +306,7 @@
def cmd_rest(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
try:
pos = int(args)
except ValueError:
@@ -322,7 +317,7 @@
def cmd_rmd(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if not args:
self.reply('ERR_ARGS')
return
@@ -336,7 +331,7 @@
def cmd_rnfr(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
path = self._generatePath(args)
if self._getFilesystem().exists(path):
self._rnfr = path
@@ -346,7 +341,7 @@
def cmd_rnto(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
path = self._generatePath(args)
if self._rnfr is None:
self.reply('ERR_RENAME')
@@ -360,7 +355,7 @@
def cmd_size(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
path = self._generatePath(args)
fs = self._getFilesystem()
if not fs.exists(path) or not fs.isfile(path):
@@ -370,7 +365,7 @@
def cmd_stor(self, args, write_mode='w'):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if not args:
self.reply('ERR_ARGS')
return
@@ -418,7 +413,7 @@
def cmd_stru(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
if len(args) == 1 and args in 'fF':
self.reply('STRU_OK')
else:
@@ -426,12 +421,12 @@
def cmd_syst(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.reply('SERVER_TYPE', self.system)
def cmd_type(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
# ascii, ebcdic, image, local <byte size>
args = args.split()
t = args[0].lower()
@@ -449,7 +444,7 @@
def cmd_user(self, args):
- 'See Zope.Server.FTP.IFTPCommandHandler.IFTPCommandHandler'
+ 'See IFTPCommandHandler'
self.authenticated = 0
if len(args) > 1:
self.username = args
=== Zope3/src/zope/server/ftp/recvchannel.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/server/ftp/recvchannel.py:1.1.2.2 Mon Dec 23 16:45:27 2002
+++ Zope3/src/zope/server/ftp/recvchannel.py Tue Dec 24 07:51:31 2002
@@ -76,11 +76,6 @@
self.inbuf = inbuf
self.finish_args = finish_args
-
- ############################################################
- # Implementation methods for interface
- # Zope.Server.ITask
-
def service(self):
"""Called to execute the task.
"""
@@ -98,14 +93,11 @@
def cancel(self):
- 'See Zope.Server.ITask.ITask'
+ 'See ITask'
self.control_channel.close_when_done()
def defer(self):
- 'See Zope.Server.ITask.ITask'
+ 'See ITask'
pass
-
- #
- ############################################################