Changed makefile() args from r/w to rb/wb, for non-unix compatability.

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index b6152470196442be7bfcffd03ddadb7737d8a81e..9a646ab6eb709d23867a17f77fb3c65b757ec719 100644 (file)
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -392,8 +392,8 @@ class StreamRequestHandler(BaseRequestHandler):
 
     def setup(self):
        self.connection = self.request
-       self.rfile = self.connection.makefile('r')
-       self.wfile = self.connection.makefile('w', 0)
+       self.rfile = self.connection.makefile('rb')
+       self.wfile = self.connection.makefile('wb', 0)
 
     def finish(self):
        self.wfile.flush()

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index e6e1a3aafc0fc4df555fe6d70c64ab450c8073ed..59eef65221dfc83a1e700bee5cc60dc11ad772cb 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -95,7 +95,7 @@ class FTP:
                if port: self.port = port
                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()
 
        # Get the welcome message from the server
@@ -288,7 +288,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`

diff --git a/Lib/gopherlib.py b/Lib/gopherlib.py
index 7550d5c60719984389297ccbaff3b68f293b8322..cf06e9583015b86186873c01abd0f587c82acd79 100644 (file)
--- a/Lib/gopherlib.py
+++ b/Lib/gopherlib.py
@@ -69,7 +69,7 @@ def send_selector(selector, host, port = 0):
        s.connect(host, port)
        s.send(selector + CRLF)
        s.shutdown(1)
-       return s.makefile('r')
+       return s.makefile('rb')
 
 # Send a selector and a query string
 def send_query(selector, query, host, port = 0):

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 3aeb643b641afd554c49b8a0ceeba21d2fb9f030..ca431ab4cb218ada054d2f33b7cb3a8f50fd0a10 100644 (file)
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -82,7 +82,7 @@ class HTTP:
                self.send('\r\n')
 
        def getreply(self):
-               self.file = self.sock.makefile('r')
+               self.file = self.sock.makefile('rb')
                self.sock = None
                line = self.file.readline()
                if self.debuglevel > 0: print 'reply:', `line`

diff --git a/Lib/nntplib.py b/Lib/nntplib.py
index eafc9eb5652f21f4ffd2921f01108b339d2e22c4..b6b395703d79a8885143f696d9155d9e800e2fe5 100644 (file)
--- a/Lib/nntplib.py
+++ b/Lib/nntplib.py
@@ -68,7 +68,7 @@ class NNTP:
                self.port = port
                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.debugging = 0
                self.welcome = self.getresp()