diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-05-07 17:45:34 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-05-07 17:45:34 (GMT) |
| commit | 4d1cd0a0a03838422805c93f680d3232673ccd00 (patch) | |
| tree | f0b4e007d6126c53ef3b3e9ec3949bf6632b18e5 /Lib/ftplib.py | |
| parent | c1d520634a25fac5dea41f3af70273fc0b3a11ae (diff) | |
| parent | fde86ff67381c40b81286dabc7641cbb44edc730 (diff) | |
| download | cpython-4d1cd0a0a03838422805c93f680d3232673ccd00.zip cpython-4d1cd0a0a03838422805c93f680d3232673ccd00.tar.gz cpython-4d1cd0a0a03838422805c93f680d3232673ccd00.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.''' |