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 807bc383eeb05cbb8b62f4a0ba180b2322a96b56..222e77d654d2ea1db8012bea9f5f4548e70cc132 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -221,7 +221,7 @@ class FTP:
     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 @@ class FTP:
         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
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 09190a0b900f148bdb3b44663661dbbcd5369b99..c10896433f91eec5e61c86269f97ecc19c5623ce 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -95,6 +95,8 @@ Core and Builtins
 Library
 -------
 
+- Issue 1726172: fix IndexError in the case of and empty response in ftplib.
+
 - Issue 2625: added missing iteritems() call to the for loop in
   mailbox.MH.get_message().