[Zope-Checkins] CVS: Zope2 - FTPRequest.py:1.9.10.2 FTPServer.py:1.16.2.2
Andreas Jung
andreas@dhcp165.digicool.com
Fri, 30 Mar 2001 10:52:21 -0500
Update of /cvs-repository/Zope2/ZServer
In directory yetix:/work/zope/Zope2/Zope2/ZServer
Modified Files:
Tag: ajung_Zope2_FTP_globbing_patch
FTPRequest.py FTPServer.py
Log Message:
changed default values for globbing parameter
--- Updated File FTPRequest.py in package Zope2 --
--- FTPRequest.py 2001/03/29 19:25:21 1.9.10.1
+++ FTPRequest.py 2001/03/30 15:51:49 1.9.10.2
@@ -100,7 +100,7 @@
class FTPRequest(HTTPRequest):
def __init__(self, path, command, channel, response, stdin=None,
- environ=None,globbing=''):
+ environ=None,globbing=None):
# we need to store the globbing information to pass it
# to the ZPublisher and the manage_FTPlist function
@@ -184,6 +184,7 @@
# Fake in globbing information
env['GLOBBING'] = self.globbing
+ print env
return env
--- Updated File FTPServer.py in package Zope2 --
--- FTPServer.py 2001/03/29 19:25:22 1.16.2.1
+++ FTPServer.py 2001/03/30 15:51:49 1.16.2.2
@@ -202,7 +202,7 @@
self.get_dir_list(line,1)
def get_dir_list(self, line, long=0):
- self.globbing = ''
+ self.globbing = None
# we need to scan the command line for arguments to '/bin/ls'...
# XXX clean this up, maybe with getopts
if len(line) > 1: