mirror of https://github.com/python/cpython.git
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: ........
This commit is contained in:
parent
0d4cbc19eb
commit
d587e300c1
|
@ -21,14 +21,17 @@ def test_trivial(self):
|
||||||
|
|
||||||
# XXX Name hacking to get this to work on Windows.
|
# XXX Name hacking to get this to work on Windows.
|
||||||
fname = os.path.abspath(urllib.request.__file__).replace('\\', '/')
|
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
|
# 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':
|
||||||
fname = '/' + fname.replace(':', '/')
|
fname = '/' + fname.replace(':', '/')
|
||||||
|
|
||||||
|
if os.name == 'nt':
|
||||||
|
file_url = "file:///%s" % fname
|
||||||
|
else:
|
||||||
file_url = "file://%s" % fname
|
file_url = "file://%s" % fname
|
||||||
|
|
||||||
f = urllib.request.urlopen(file_url)
|
f = urllib.request.urlopen(file_url)
|
||||||
|
|
||||||
buf = f.read()
|
buf = f.read()
|
||||||
|
|
Loading…
Reference in New Issue