Fix Issue #3817: 225 is now considered a valid response code for ABOR

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index ad00e310bd6dded4bebb19ca5f3fd66d42877995..31ac526957d213e35de80e0d24c2e76c5cf02dd4 100644 (file)
--- 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 bc6ccf1cf16f93ca8a188d2dd775be3e00b02412..ca953c88368a8ee85a0650441a0c45b8ba83b98f 100644 (file)
--- 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