From cf445fced474f4df3b67ec3cb4ae6f761173d93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Sun, 18 Apr 2010 12:55:03 +0000 Subject: [PATCH] Fix Issue #3817: 225 is now considered a valid response code for ABOR --- Lib/ftplib.py | 2 +- Misc/NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/ftplib.py b/Lib/ftplib.py index ad00e310bd6..31ac526957d 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): diff --git a/Misc/NEWS b/Misc/NEWS index bc6ccf1cf16..ca953c88368 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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