mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 23:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 80172 via svnmerge from

Browse source 
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:13:54 +00:00
parent 9cef92151c
commit fa1520a660
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/ftplib.py
View file

@ -234,7 +234,7 @@ class FTP:
if self.debugging > 1: print '*put urgent*', self.sanitize(line) if self.debugging > 1: print '*put urgent*', self.sanitize(line)
self.sock.sendall(line, MSG_OOB) self.sock.sendall(line, MSG_OOB)
resp = self.getmultiline() resp = self.getmultiline()
if resp[:3] not in ('426', '226'): if resp[:3] not in ('426', '225', '226'):
raise error_proto, resp raise error_proto, resp
def sendcmd(self, cmd): def sendcmd(self, cmd):

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 2.6.6 alpha 1?
Core and Builtins 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 - Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is
passed to bytearray. passed to bytearray.