diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-18 12:55:03 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-18 12:55:03 (GMT) |
| commit | cf445fced474f4df3b67ec3cb4ae6f761173d93c (patch) | |
| tree | 0b0b36121f19f21b552e021ddc8eee493071542d | |
| parent | 5ac74168b9e61ad212017bd848ea98f799b88527 (diff) | |
| download | cpython-cf445fced474f4df3b67ec3cb4ae6f761173d93c.zip cpython-cf445fced474f4df3b67ec3cb4ae6f761173d93c.tar.gz cpython-cf445fced474f4df3b67ec3cb4ae6f761173d93c.tar.bz2 | |
Fix Issue #3817: 225 is now considered a valid response code for ABOR
| -rw-r--r-- | Lib/ftplib.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index ad00e31..31ac526 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -235,7 +235,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): @@ -18,6 +18,9 @@ Core and Builtins Library ------- +- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response + code as stated in RFC-959 at chapter 5.4. + - Issue #8279: Fix test_gdb failures. - Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the |