mirror of
https://github.com/AdaCore/cpython.git
synced 2026-02-12 12:57:15 -08:00
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:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user