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

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 222e77d654d2ea1db8012bea9f5f4548e70cc132..c0cfe27d89b9c236d794920bb29441d65708a239 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -234,7 +234,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 a4ee20e193b359d253bcdcc502e965f80f1a95f2..6482c03466e547f48c3b00a418d37244dd2d188a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6.6 alpha 1?
 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.