diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-10 17:42:29 +0000 |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-10 17:42:29 +0000 |
| commit | 08ecfddf998046d213736f0ddfc8e321c31a1cd5 (patch) | |
| tree | 4399bd36f325d868dfab18ae7cc2c0ff876a6252 /Lib/test | |
| parent | d875be028738cf16095a0fb9fc66e8105addb37c (diff) | |
| download | cpython-git-08ecfddf998046d213736f0ddfc8e321c31a1cd5.tar.gz | |
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:
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_urllib2.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 1ecb56e9d7..485d5e9851 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -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() |