Always open file objects in binary mode.

gvanrossum · gvanrossum · commit 24611f80e8d4 · 1996-09-30T22:02:50.000Z
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
@@ -111,7 +111,7 @@ def connect(self, host = '', port = 0):
 		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 @@ def retrlines(self, cmd, callback = None):
 		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`
