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
........
This commit is contained in:
Giampaolo Rodolà 2010-04-18 13:36:35 +00:00
parent 88d7dbdc0e
commit ceb513ab13
2 changed files with 4 additions and 1 deletions

View file

@ -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):