summaryrefslogtreecommitdiffstats
path: root/Lib/ftplib.py
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2011-05-07 17:03:47 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2011-05-07 17:03:47 (GMT)
commit0b5c21f9c96e6a0734dd7bcbdeec05500a7baf70 (patch)
tree907d6ad83959a7940400a95d6f43064b70dcdd0d /Lib/ftplib.py
parent81638f1351780eccb70bbc701ce366861a914d2e (diff)
downloadcpython-0b5c21f9c96e6a0734dd7bcbdeec05500a7baf70.zip
cpython-0b5c21f9c96e6a0734dd7bcbdeec05500a7baf70.tar.gz
cpython-0b5c21f9c96e6a0734dd7bcbdeec05500a7baf70.tar.bz2
#12002 - ftplib's abort() method raises TypeError
Diffstat (limited to 'Lib/ftplib.py')
-rw-r--r--Lib/ftplib.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index ea91c17..af213f3 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -232,12 +232,13 @@ class FTP:
This does not follow the procedure from the RFC to send Telnet
IP and Synch; that doesn't seem to work with the servers I've
tried. Instead, just send the ABOR command as OOB data.'''
- line = 'ABOR' + CRLF
+ line = b'ABOR' + B_CRLF
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', '225', '226'):
raise error_proto(resp)
+ return resp
def sendcmd(self, cmd):
'''Send a command and return the response.'''