Kaydet (Commit) 2e3da14d authored tarafından Senthil Kumaran's avatar Senthil Kumaran

Fixed issue7648 - test_urllib2 fails on Windows if not run from C:

üst 5a0b399a
...@@ -21,8 +21,7 @@ class TrivialTests(unittest.TestCase): ...@@ -21,8 +21,7 @@ class TrivialTests(unittest.TestCase):
# XXX Name hacking to get this to work on Windows. # XXX Name hacking to get this to work on Windows.
fname = os.path.abspath(urllib2.__file__).replace('\\', '/') 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 # And more hacking to get it to work on MacOS. This assumes
# urllib.pathname2url works, unfortunately... # urllib.pathname2url works, unfortunately...
if os.name == 'mac': if os.name == 'mac':
...@@ -32,7 +31,11 @@ class TrivialTests(unittest.TestCase): ...@@ -32,7 +31,11 @@ class TrivialTests(unittest.TestCase):
fname = os.expand(fname) fname = os.expand(fname)
fname = fname.translate(string.maketrans("/.", "./")) 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) f = urllib2.urlopen(file_url)
buf = f.read() buf = f.read()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment