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

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Sun Apr 18 15:13:54 2010
New Revision: 80173

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/ftplib.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/ftplib.py
==============================================================================
--- python/branches/release26-maint/Lib/ftplib.py	(original)
+++ python/branches/release26-maint/Lib/ftplib.py	Sun Apr 18 15:13:54 2010
@@ -234,7 +234,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/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Apr 18 15:13:54 2010
@@ -12,6 +12,9 @@
 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.