[Python-checkins] r80172 - in python/trunk: Lib/ftplib.py Misc/NEWS

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Sun Apr 18 14:55:03 2010
New Revision: 80172

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

Modified:
   python/trunk/Lib/ftplib.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/ftplib.py
==============================================================================
--- python/trunk/Lib/ftplib.py	(original)
+++ python/trunk/Lib/ftplib.py	Sun Apr 18 14:55:03 2010
@@ -235,7 +235,7 @@
         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):

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Apr 18 14:55:03 2010
@@ -18,6 +18,9 @@
 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