diff options
| author | Giampaolo Rodola' <g.rodola@gmail.com> | 2011-05-07 17:35:36 (GMT) |
|---|---|---|
| committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2011-05-07 17:35:36 (GMT) |
| commit | fde86ff67381c40b81286dabc7641cbb44edc730 (patch) | |
| tree | 29fcd0fa5ff7c704ca3e95c67153a1b0b478d498 /Lib/ftplib.py | |
| parent | 63e4230c3865f6b15538b61fbecd5d0286b1f0a9 (diff) | |
| parent | 0b5c21f9c96e6a0734dd7bcbdeec05500a7baf70 (diff) | |
| download | cpython-fde86ff67381c40b81286dabc7641cbb44edc730.zip cpython-fde86ff67381c40b81286dabc7641cbb44edc730.tar.gz cpython-fde86ff67381c40b81286dabc7641cbb44edc730.tar.bz2 | |
merge
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 3 |
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.''' |