mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 12:16:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

as per discussion with antoine revert changes made in 83708 as the user useing ftplib's readline methods is supposed to always use a binary file

Browse source
This commit is contained in:
Giampaolo Rodolà 2010-08-04 10:36:18 +00:00
parent 226e945fe5
commit f96482e91a
4 changed files with 12 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/ftplib.py
View file

@ -493,15 +493,9 @@ class FTP:
while 1:
buf = fp.readline()
if not buf: break
if isinstance(buf, str):
if not buf.endswith(CRLF):
if buf[-1] in CRLF: buf = buf[:-1]
buf = buf + CRLF
buf = bytes(buf, self.encoding)
else:
if not buf.endswith(B_CRLF):
if buf[-1:] in B_CRLF: buf = buf[:-1]
buf = buf + B_CRLF
if buf[-2:] != B_CRLF:
if buf[-1] in B_CRLF: buf = buf[:-1]
buf = buf + B_CRLF
conn.sendall(buf)
if callback: callback(buf)
conn.close()
@ -777,15 +771,9 @@ else:
while 1:
buf = fp.readline()
if not buf: break
if isinstance(buf, str):
if not buf.endswith(CRLF):
if buf[-1] in CRLF: buf = buf[:-1]
buf = buf + CRLF
buf = bytes(buf, self.encoding)
else:
if not buf.endswith(B_CRLF):
if buf[-1:] in B_CRLF: buf = buf[:-1]
buf = buf + B_CRLF
if buf[-2:] != B_CRLF:
if buf[-1] in B_CRLF: buf = buf[:-1]
buf = buf + B_CRLF
conn.sendall(buf)
if callback: callback(buf)
# shutdown ssl layer
@ -795,7 +783,6 @@ else:
conn.close()
return self.voidresp()
__all__.append('FTP_TLS')
all_errors = (Error, IOError, EOFError, ssl.SSLError)