[Python-checkins] r80175 - in python/branches/release31-maint: Lib/ftplib.py Misc/NEWS

giampaolo.rodola python-checkins at python.org
Sun Apr 18 15:23:22 CEST 2010


Author: giampaolo.rodola
Date: Sun Apr 18 15:23:21 2010
New Revision: 80175

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

Modified:
   python/branches/release31-maint/Lib/ftplib.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/ftplib.py
==============================================================================
--- python/branches/release31-maint/Lib/ftplib.py	(original)
+++ python/branches/release31-maint/Lib/ftplib.py	Sun Apr 18 15:23:21 2010
@@ -236,7 +236,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/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Apr 18 15:23:21 2010
@@ -31,6 +31,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 #8394: _ctypes.dlopen() accepts bytes, bytearray and str with
   surrogates.
 


More information about the Python-checkins mailing list