From 4fbed104555725ee73f967df76b3ff9e2f47d377 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sat, 8 May 2010 03:29:09 +0000 Subject: Merged revisions 80953 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80953 | senthil.kumaran | 2010-05-08 08:41:50 +0530 (Sat, 08 May 2010) | 3 lines Fix Issue8656 - urllib2 mangles file://-scheme URLs ........ --- Lib/urllib/request.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Lib/urllib/request.py') diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 3293966a19..098630ebcb 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1216,7 +1216,8 @@ class FileHandler(BaseHandler): host, port = splitport(host) if not host or \ (not port and _safe_gethostbyname(host) in self.get_names()): - return addinfourl(open(localfile, 'rb'), headers, 'file:'+file) + return addinfourl(open(localfile, 'rb'), headers, 'file://'+ + host + file) except OSError as msg: # users shouldn't expect OSErrors coming from urlopen() raise URLError(msg) -- cgit v1.2.1