From c511aee0e37d82639dcd4f9b3d0446b8a05d8077 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 11 Apr 1997 19:01:48 +0000 Subject: [PATCH] Open files in binary mode. --- Lib/urllib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index 49c9032b223..e57311b519b 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -183,7 +183,7 @@ def retrieve(self, url, filename=None): result = filename, headers if self.tempcache is not None: self.tempcache[url] = result - tfp = open(filename, 'w') + tfp = open(filename, 'wb') bs = 1024*8 block = fp.read(bs) while block: @@ -284,12 +284,12 @@ def open_file(self, url): def open_local_file(self, url): host, file = splithost(url) if not host: - return addinfourl(open(url2pathname(file), 'r'), noheaders(), 'file:'+file) + return addinfourl(open(url2pathname(file), 'rb'), noheaders(), 'file:'+file) host, port = splitport(host) if not port and socket.gethostbyname(host) in ( localhost(), thishost()): file = unquote(file) - return addinfourl(open(url2pathname(file), 'r'), noheaders(), 'file:'+file) + return addinfourl(open(url2pathname(file), 'rb'), noheaders(), 'file:'+file) raise IOError, ('local file error', 'not on local host') # Use FTP protocol @@ -785,7 +785,7 @@ def test(): print '======' for k in h.keys(): print k + ':', h[k] print '======' - fp = open(fn, 'r') + fp = open(fn, 'rb') data = fp.read() del fp print regsub.gsub('\r', '', data)