[Python-checkins] r77414 - in python/branches/py3k: Lib/test/test_urllib2.py
senthil.kumaran
python-checkins at python.org
Sun Jan 10 18:45:53 CET 2010
Author: senthil.kumaran
Date: Sun Jan 10 18:45:52 2010
New Revision: 77414
Log:
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:
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/test_urllib2.py
Modified: python/branches/py3k/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2.py (original)
+++ python/branches/py3k/Lib/test/test_urllib2.py Sun Jan 10 18:45:52 2010
@@ -21,14 +21,17 @@
# 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()
More information about the Python-checkins
mailing list