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 222e77d..c0cfe27 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -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):