mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 06:31:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 71217 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Georg Brandl 2009-04-05 10:51:10 +00:00
parent e42e2535c4
commit f7a1efcd98
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/ftplib.py
View file

@ -221,7 +221,7 @@ class FTP:
def voidresp(self): def voidresp(self):
"""Expect a response beginning with '2'.""" """Expect a response beginning with '2'."""
resp = self.getresp() resp = self.getresp()
if resp[0] != '2': if resp[:1] != '2':
raise error_reply, resp raise error_reply, resp
return resp return resp
@ -520,8 +520,6 @@ class FTP:
resp = self.sendcmd('DELE ' + filename) resp = self.sendcmd('DELE ' + filename)
if resp[:3] in ('250', '200'): if resp[:3] in ('250', '200'):
return resp return resp
elif resp[:1] == '5':
raise error_perm, resp
else: else:
raise error_reply, resp raise error_reply, resp

2
Misc/NEWS
View file

@ -95,6 +95,8 @@ Core and Builtins
Library 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 - Issue 2625: added missing iteritems() call to the for loop in
mailbox.MH.get_message(). mailbox.MH.get_message().