From: Senthil Kumaran Date: Sun, 10 Jan 2010 17:35:05 +0000 (+0000) Subject: Fixed issue7648 - test_urllib2 fails on Windows if not run from C: X-Git-Tag: v2.7a3~191 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e3da14d8b6fc13f1514dce8420c992d7aaf13f8;p=python Fixed issue7648 - test_urllib2 fails on Windows if not run from C: --- diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 1c57ec6563..4b09218235 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -21,8 +21,7 @@ class TrivialTests(unittest.TestCase): # XXX Name hacking to get this to work on Windows. fname = os.path.abspath(urllib2.__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': @@ -32,7 +31,11 @@ class TrivialTests(unittest.TestCase): fname = os.expand(fname) fname = fname.translate(string.maketrans("/.", "./")) - file_url = "file://%s" % fname + if os.name == 'nt': + file_url = "file:///%s" % fname + else: + file_url = "file://%s" % fname + f = urllib2.urlopen(file_url) buf = f.read()