From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Sun, 18 Apr 2010 13:13:54 +0000 (+0000)
Subject: Merged revisions 80172 via svnmerge from
X-Git-Tag: v2.6.6rc1~449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa1520a660c6a1637c07755351695c48b7c64b82;p=thirdparty%2FPython%2Fcpython.git

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 222e77d654d2..c0cfe27d89b9 100644
--- 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 a4ee20e193b3..6482c03466e5 100644
--- 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.