From 673d7e91f7098478ca972267e153da7ff95cc291 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 10 Jan 2010 17:48:37 +0000 Subject: [PATCH] Merged revisions 77414 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77414 | senthil.kumaran | 2010-01-10 23:15:52 +0530 (Sun, 10 Jan 2010) | 9 lines Merged revisions 77411 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77411 | senthil.kumaran | 2010-01-10 23:05:05 +0530 (Sun, 10 Jan 2010) | 2 lines Fixed issue7648 - test_urllib2 fails on Windows if not run from C: ........ ................ --- Lib/test/test_urllib2.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index a0fff26f1e..66ef0d6c83 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -21,14 +21,17 @@ class TrivialTests(unittest.TestCase): # XXX Name hacking to get this to work on Windows. fname = os.path.abspath(urllib.request.__file__).replace('\\', '/') - if fname[1:2] == ":": - fname = fname[2:] + # And more hacking to get it to work on MacOS. This assumes # urllib.pathname2url works, unfortunately... if os.name == 'mac': fname = '/' + fname.replace(':', '/') - file_url = "file://%s" % fname + if os.name == 'nt': + file_url = "file:///%s" % fname + else: + file_url = "file://%s" % fname + f = urllib.request.urlopen(file_url) buf = f.read() -- 2.50.1