diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 222e77d654d..c0cfe27d89b 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): diff --git a/Misc/NEWS b/Misc/NEWS index a4ee20e193b..6482c03466e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.6.6 alpha 1? Core and Builtins ----------------- +- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response + code as stated in RFC-959 at chapter 5.4. + - Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is passed to bytearray.