summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-02-19 21:15:44 (GMT)
committerGuido van Rossum <guido@python.org>1998-02-19 21:15:44 (GMT)
commit9824509d3ee84f00ba658e249bad81e00e3b98bf (patch)
tree659e7a70ca84c989a05aa583fd6eb30d824fcc5e
parent0d530cedd7563d75e33c488c742ea74f5f5a703b (diff)
downloadcpython-9824509d3ee84f00ba658e249bad81e00e3b98bf.zip
cpython-9824509d3ee84f00ba658e249bad81e00e3b98bf.tar.gz
cpython-9824509d3ee84f00ba658e249bad81e00e3b98bf.tar.bz2
Add rmd() (remove directory command); fix comment in parse257.
In login(), force passwd and acct to '' when they are None (this can happen in the test program!).
-rw-r--r--Lib/ftplib.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 024a0fa..5274b75 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -287,6 +287,8 @@ class FTP:
def login(self, user = '', passwd = '', acct = ''):
'''Login, default anonymous.'''
if not user: user = 'anonymous'
+ if not passwd: passwd = ''
+ if not acct: acct = ''
if user == 'anonymous' and passwd in ('', '-'):
thishost = socket.gethostname()
# Make sure it is fully qualified
@@ -450,6 +452,10 @@ class FTP:
resp = self.sendcmd('MKD ' + dirname)
return parse257(resp)
+ def rmd(self, dirname):
+ '''Remove a directory.'''
+ return self.voidcmd('RMD ' + dirname)
+
def pwd(self):
'''Return current working directory.'''
resp = self.sendcmd('PWD')
@@ -508,8 +514,8 @@ def parse227(resp):
def parse257(resp):
- '''Parse the '257' response for a MKD or RMD request.
- This is a response to a MKD or RMD request: a directory name.
+ '''Parse the '257' response for a MKD or PWD request.
+ This is a response to a MKD or PWD request: a directory name.
Returns the directoryname in the 257 reply.'''
if resp[:3] <> '257':