traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:42:29 +00:00
parent d875be0287
commit 08ecfddf99
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_urllib2.py
View File

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