Merge from 2.2 branch

d33afa33 · 26af3f79 · d33afa33 · d33afa33
Commit d33afa33 authored Jul 05, 2000 by
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

ZServer/medusa/ftp_server.py ZServer/medusa/ftp_server.py +2 -3

lib/python/ZServer/medusa/ftp_server.py lib/python/ZServer/medusa/ftp_server.py +2 -3

No files found.
--- a/ZServer/medusa/ftp_server.py
+++ b/ZServer/medusa/ftp_server.py
@@ -5,7 +5,7 @@
 #						 All Rights Reserved.
 #
-RCS_ID =  '$Id: ftp_server.py,v 1.12 2000/06/02 14:22:48 brian Exp $'
+RCS_ID =  '$Id: ftp_server.py,v 1.13 2000/07/05 14:22:13 brian Exp $'
 # An extensible, configurable, asynchronous FTP server.
 # 
@@ -670,8 +670,7 @@ class ftp_channel (asynchat.async_chat):
 		'give help information'
 		# find all the methods that match 'cmd_xxxx',
 		# use their docstrings for the help response.
-		import newdir
+		attrs = dir(self.__class__)
-		attrs = newdir.dir(self.__class__)
 		help_lines = []
 		for attr in attrs:
 			if attr[:4] == 'cmd_':

--- a/lib/python/ZServer/medusa/ftp_server.py
+++ b/lib/python/ZServer/medusa/ftp_server.py
@@ -5,7 +5,7 @@
 #						 All Rights Reserved.
 #
-RCS_ID =  '$Id: ftp_server.py,v 1.12 2000/06/02 14:22:48 brian Exp $'
+RCS_ID =  '$Id: ftp_server.py,v 1.13 2000/07/05 14:22:13 brian Exp $'
 # An extensible, configurable, asynchronous FTP server.
 # 
@@ -670,8 +670,7 @@ class ftp_channel (asynchat.async_chat):
 		'give help information'
 		# find all the methods that match 'cmd_xxxx',
 		# use their docstrings for the help response.
-		import newdir
+		attrs = dir(self.__class__)
-		attrs = newdir.dir(self.__class__)
 		help_lines = []
 		for attr in attrs:
 			if attr[:4] == 'cmd_':