[Python-checkins] r77411 - python/trunk/Lib/test/test_urllib2.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Sun Jan 10 18:35:05 2010
New Revision: 77411

Log:
Fixed issue7648 - test_urllib2 fails on Windows if not run from C:


Modified:
   python/trunk/Lib/test/test_urllib2.py

Modified: python/trunk/Lib/test/test_urllib2.py
==============================================================================
--- python/trunk/Lib/test/test_urllib2.py	(original)
+++ python/trunk/Lib/test/test_urllib2.py	Sun Jan 10 18:35:05 2010
@@ -21,8 +21,7 @@
 
         # 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 @@
             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()