Index: Lib/ftplib.py
===================================================================
--- Lib/ftplib.py	(revisione 80687)
+++ Lib/ftplib.py	(copia locale)
@@ -479,9 +479,15 @@
         while 1:
             buf = fp.readline()
             if not buf: break
-            if buf[-2:] != B_CRLF:
-                if buf[-1] in B_CRLF: buf = buf[:-1]
-                buf = buf + B_CRLF
+            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
             conn.sendall(buf)
             if callback: callback(buf)
         conn.close()
@@ -742,9 +748,15 @@
                 while 1:
                     buf = fp.readline()
                     if not buf: break
-                    if buf[-2:] != B_CRLF:
-                        if buf[-1] in B_CRLF: buf = buf[:-1]
-                        buf = buf + B_CRLF
+                    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
                     conn.sendall(buf)
                     if callback: callback(buf)
                 # shutdown ssl layer
@@ -754,6 +766,7 @@
                 conn.close()
             return self.voidresp()
 
+
     __all__.append('FTP_TLS')
     all_errors = (Error, IOError, EOFError, ssl.SSLError)
 
Index: Lib/test/test_ftplib.py
===================================================================
--- Lib/test/test_ftplib.py	(revisione 80687)
+++ Lib/test/test_ftplib.py	(copia locale)
@@ -23,6 +23,7 @@
 # the dummy data returned by server over the data channel when
 # RETR, LIST and NLST commands are issued
 RETR_DATA = 'abcde12345\r\n' * 1000
+RETR_TEXT = 'abcd\xe912345\r\n' * 1000
 LIST_DATA = 'foo\r\nbar\r\n'
 NLST_DATA = 'foo\r\nbar\r\n'
 
@@ -36,7 +37,7 @@
         self.baseclass.last_received_data = ''
 
     def handle_read(self):
-        self.baseclass.last_received_data += self.recv(1024).decode('ascii')
+        self.baseclass.last_received_data += self.recv(1024).decode('latin-1')
 
     def handle_close(self):
         # XXX: this method can be called many times in a row for a single
@@ -48,7 +49,7 @@
             self.dtp_conn_closed = True
 
     def push(self, what):
-        super(DummyDTPHandler, self).push(what.encode('ascii'))
+        super(DummyDTPHandler, self).push(what.encode('latin-1'))
 
 
 class DummyFTPHandler(asynchat.async_chat):
@@ -64,6 +65,7 @@
         self.last_received_data = ''
         self.next_response = ''
         self.rest = None
+        self.current_type = 'a'
         self.push('220 welcome')
 
     def collect_incoming_data(self, data):
@@ -168,7 +170,16 @@
         self.push('257 "pwd ok"')
 
     def cmd_type(self, arg):
-        self.push('200 type ok')
+        # ASCII type
+        if arg.lower() == 'a':
+            self.current_type = 'a'
+            self.push('200 type ok')
+        # Binary type
+        elif arg.lower() == 'i':
+            self.current_type = 'i'
+            self.push('200 type ok')
+        else:
+            self.push('504 unsupported type')
 
     def cmd_quit(self, arg):
         self.push('221 quit ok')
@@ -187,7 +198,10 @@
             offset = int(self.rest)
         else:
             offset = 0
-        self.dtp.push(RETR_DATA[offset:])
+        if self.current_type == 'i':
+            self.dtp.push(RETR_DATA[offset:])
+        else:
+            self.dtp.push(RETR_TEXT[offset:])
         self.dtp.close_when_done()
         self.rest = None
 
@@ -504,7 +518,7 @@
     def test_retrlines(self):
         received = []
         self.client.retrlines('retr', received.append)
-        self.assertEqual(''.join(received), RETR_DATA.replace('\r\n', ''))
+        self.assertEqual(''.join(received), RETR_TEXT.replace('\r\n', ''))
 
     def test_storbinary(self):
         f = io.BytesIO(RETR_DATA.encode('ascii'))
@@ -523,7 +537,7 @@
             self.client.storbinary('stor', f, rest=r)
             self.assertEqual(self.server.handler.rest, str(r))
 
-    def test_storlines(self):
+    def test_storlines_bytes(self):
         f = io.BytesIO(RETR_DATA.replace('\r\n', '\n').encode('ascii'))
         self.client.storlines('stor', f)
         self.assertEqual(self.server.handler.last_received_data, RETR_DATA)
@@ -533,6 +547,16 @@
         self.client.storlines('stor foo', f, callback=lambda x: flag.append(None))
         self.assertTrue(flag)
 
+    def test_storlines_str(self):
+        f = io.StringIO(RETR_TEXT.replace('\r\n', '\n'))
+        self.client.storlines('stor', f)
+        self.assertEqual(self.server.handler.last_received_data, RETR_TEXT)
+        # test new callback arg
+        flag = []
+        f.seek(0)
+        self.client.storlines('stor foo', f, callback=lambda x: flag.append(None))
+        self.assertTrue(flag)
+
     def test_nlst(self):
         self.client.nlst()
         self.assertEqual(self.client.nlst(), NLST_DATA.split('\r\n')[:-1])