diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 1996-02-14 16:06:24 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 1996-02-14 16:06:24 (GMT) |
| commit | 2bb57b81f211f5c16d9542620b180dd5097d57c7 (patch) | |
| tree | 48bbd277e7850dd5741cc32ba1e5218921821850 | |
| parent | 0d12ead05cf43d3a8f6e79a1b20fc56c7fb5bc86 (diff) | |
| download | cpython-2bb57b81f211f5c16d9542620b180dd5097d57c7.zip cpython-2bb57b81f211f5c16d9542620b180dd5097d57c7.tar.gz cpython-2bb57b81f211f5c16d9542620b180dd5097d57c7.tar.bz2 | |
Changed makefile() args from r/w to rb/wb, for non-unix compatability.
| -rw-r--r-- | Lib/SocketServer.py | 4 | ||||
| -rw-r--r-- | Lib/ftplib.py | 4 | ||||
| -rw-r--r-- | Lib/gopherlib.py | 2 | ||||
| -rw-r--r-- | Lib/httplib.py | 2 | ||||
| -rw-r--r-- | Lib/nntplib.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index b615247..9a646ab 100644 --- 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 e6e1a3a..59eef65 100644 --- 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 7550d5c..cf06e95 100644 --- 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 3aeb643..ca431ab 100644 --- 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 eafc9eb..b6b3957 100644 --- 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() |