mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 77414 via svnmerge from

Browse source 
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:
  ........
................
This commit is contained in:
Senthil Kumaran 2010-01-10 17:48:37 +00:00
parent 53087a5fe8
commit 673d7e91f7
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_urllib2.py
View file

@ -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()