summaryrefslogtreecommitdiffstats
path: root/Lib/ftplib.py
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2010-04-18 13:36:35 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2010-04-18 13:36:35 (GMT)
commitceb513ab131aee1059f8bdc9cf9260bb306ef0e9 (patch)
tree74e9e479aed96fbe4b1d6604218230d1645d8da2 /Lib/ftplib.py
parent88d7dbdc0e14c9e9656ed03616d254da17fe5160 (diff)
downloadcpython-ceb513ab131aee1059f8bdc9cf9260bb306ef0e9.zip
cpython-ceb513ab131aee1059f8bdc9cf9260bb306ef0e9.tar.gz
cpython-ceb513ab131aee1059f8bdc9cf9260bb306ef0e9.tar.bz2
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 ........
Diffstat (limited to 'Lib/ftplib.py')
-rw-r--r--Lib/ftplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index ea3f996..c8eb078 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -237,7 +237,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):