From f7a1efcd98dbb7d02f75668d8c7e4df2eb37b942 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 5 Apr 2009 10:51:10 +0000 Subject: [PATCH] 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. ........ --- Lib/ftplib.py | 4 +--- Misc/NEWS | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 807bc383eeb..222e77d654d 100644 --- 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 09190a0b900..c10896433f9 100644 --- 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().