diff Lib/ftplib.py @ 69920:de411da2dbdb 3.2

merge with 3.1
author Giampaolo Rodola' <g.rodola@gmail.com>
date Sat, 07 May 2011 19:09:34 +0200
parents 81d7f78a633a 31220cd936d2
children c741ba9e37ef 8521c06a828a
line wrap: on
line diff
--- a/Lib/ftplib.py	Sat May 07 19:50:28 2011 +0300
+++ b/Lib/ftplib.py	Sat May 07 19:09:34 2011 +0200
@@ -241,12 +241,13 @@
         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.'''
@@ -781,6 +782,15 @@
                 conn.close()
             return self.voidresp()
 
+        def abort(self):
+            # overridden as we can't pass MSG_OOB flag to sendall()
+            line = b'ABOR' + B_CRLF
+            self.sock.sendall(line)
+            resp = self.getmultiline()
+            if resp[:3] not in {'426', '225', '226'}:
+                raise error_proto(resp)
+            return resp
+
     __all__.append('FTP_TLS')
     all_errors = (Error, IOError, EOFError, ssl.SSLError)