Merged revisions 71217 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71217 | georg.brandl | 2009-04-05 12:48:47 +0200 (So, 05 Apr 2009) | 1 line
#1726172: dont raise an unexpected IndexError if a voidresp() call has an empty response.
........
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 807bc38..222e77d 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -221,7 +221,7 @@
def voidresp(self):
"""Expect a response beginning with '2'."""
resp = self.getresp()
- if resp[0] != '2':
+ if resp[:1] != '2':
raise error_reply, resp
return resp
@@ -520,8 +520,6 @@
resp = self.sendcmd('DELE ' + filename)
if resp[:3] in ('250', '200'):
return resp
- elif resp[:1] == '5':
- raise error_perm, resp
else:
raise error_reply, resp