[Python-checkins] r80176 - in python/branches/py3k: Lib/ftplib.py Misc/NEWS

giampaolo.rodola python-checkins at python.org
Sun Apr 18 15:36:35 CEST 2010


Author: giampaolo.rodola
Date: Sun Apr 18 15:36:35 2010
New Revision: 80176

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/py3k/   (props changed)
   python/branches/py3k/Lib/ftplib.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/ftplib.py
==============================================================================
--- python/branches/py3k/Lib/ftplib.py	(original)
+++ python/branches/py3k/Lib/ftplib.py	Sun Apr 18 15:36:35 2010
@@ -237,7 +237,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/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Apr 18 15:36:35 2010
@@ -315,6 +315,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