From ceb513ab131aee1059f8bdc9cf9260bb306ef0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Sun, 18 Apr 2010 13:36:35 +0000 Subject: 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 ........ --- 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 ea3f996..c8eb078 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -237,7 +237,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 89e2bf6..5b08d19 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -315,6 +315,9 @@ C-API 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. -- cgit v0.12