Always open file objects in binary mode.

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index e42ed8c6dfc66d400a41aa7ceda70ddd16076c18..e24036a2019bade81761a54d24c88acc5af990e0 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -111,7 +111,7 @@ class FTP:
                self.passiveserver = 0
                self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                self.sock.connect(self.host, self.port)
-               self.file = self.sock.makefile('r')
+               self.file = self.sock.makefile('rb')
                self.welcome = self.getresp()
 
        def getwelcome(self):
@@ -323,7 +323,7 @@ class FTP:
                if not callback: callback = print_line
                resp = self.sendcmd('TYPE A')
                conn = self.transfercmd(cmd)
-               fp = conn.makefile('r')
+               fp = conn.makefile('rb')
                while 1:
                        line = fp.readline()
                        if self.debugging > 2: print '*retr*', `line`