diff options
author | Giampaolo RodolĂ <g.rodola@gmail.com> | 2010-04-18 13:23:21 (GMT) |
---|---|---|
committer | Giampaolo RodolĂ <g.rodola@gmail.com> | 2010-04-18 13:23:21 (GMT) |
commit | 22357e1e01c5ae38b43ef9c048be3fdd25703579 (patch) | |
tree | d5de4fdbf2f6e661aa22f7fe5d19c87acaae992b | |
parent | a88d7dfda81669842420a48c3e25664570c6b4e7 (diff) | |
download | cpython-22357e1e01c5ae38b43ef9c048be3fdd25703579.zip cpython-22357e1e01c5ae38b43ef9c048be3fdd25703579.tar.gz cpython-22357e1e01c5ae38b43ef9c048be3fdd25703579.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 7e678b4..bcfa652 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -236,7 +236,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): @@ -31,6 +31,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 #8394: _ctypes.dlopen() accepts bytes, bytearray and str with surrogates. |