diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-10 17:48:37 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-10 17:48:37 (GMT) |
| commit | 673d7e91f7098478ca972267e153da7ff95cc291 (patch) | |
| tree | d9ae81a4886a106bde5323e0742a93deea111270 /Lib | |
| parent | 53087a5fe88588a0e71d71460ca62c5498a50113 (diff) | |
| download | cpython-673d7e91f7098478ca972267e153da7ff95cc291.zip cpython-673d7e91f7098478ca972267e153da7ff95cc291.tar.gz cpython-673d7e91f7098478ca972267e153da7ff95cc291.tar.bz2 | |
Merged revisions 77414 via svnmerge from
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:
........
................
Diffstat (limited to 'Lib')
| -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 a0fff26..66ef0d6 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -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() |