diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-18 13:13:54 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-18 13:13:54 (GMT) |
| commit | fa1520a660c6a1637c07755351695c48b7c64b82 (patch) | |
| tree | 0389586f8dbed1d1bf54a730fc600c2ede0dc049 /Lib/ftplib.py | |
| parent | 9cef92151c67f116cbd983f6649904c914b6befc (diff) | |
| download | cpython-fa1520a660c6a1637c07755351695c48b7c64b82.zip cpython-fa1520a660c6a1637c07755351695c48b7c64b82.tar.gz cpython-fa1520a660c6a1637c07755351695c48b7c64b82.tar.bz2 | |
Merged revisions 80172 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80172 | giampaolo.rodola | 2010-04-18 14:55:03 +0200 (dom, 18 apr 2010) | 1 line
Fix Issue #3817: 225 is now considered a valid response code for ABOR
........
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 222e77d..c0cfe27 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -234,7 +234,7 @@ class FTP: if self.debugging > 1: print '*put urgent*', self.sanitize(line) self.sock.sendall(line, MSG_OOB) resp = self.getmultiline() - if resp[:3] not in ('426', '226'): + if resp[:3] not in ('426', '225', '226'): raise error_proto, resp def sendcmd(self, cmd): |