[Python-checkins] cpython (2.7): Issue #7665: Fixed tests test_ntpath and test_urllib2 when ran in the

Mon Jan 26 09:28:18 CET 2015

https://hg.python.org/cpython/rev/1e12c9e5bc89
changeset: 94292:1e12c9e5bc89
branch: 2.7
parent: 94207:2db41d551a4f
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Jan 26 10:26:00 2015 +0200
summary:
 Issue #7665: Fixed tests test_ntpath and test_urllib2 when ran in the
directory containing a backslash.
files:
 Lib/test/test_ntpath.py | 7 ++++---
 Lib/test/test_urllib2.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -281,13 +281,14 @@
 tester('ntpath.abspath("C:\\")', "C:\\")
 
 def test_relpath(self):
- currentdir = os.path.split(os.getcwd())[-1]
 tester('ntpath.relpath("a")', 'a')
 tester('ntpath.relpath(os.path.abspath("a"))', 'a')
 tester('ntpath.relpath("a/b")', 'a\\b')
 tester('ntpath.relpath("../a/b")', '..\\a\\b')
- tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a')
- tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b')
+ with test_support.temp_cwd(test_support.TESTFN) as cwd_dir:
+ currentdir = os.path.basename(cwd_dir)
+ tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a')
+ tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b')
 tester('ntpath.relpath("a", "b/c")', '..\\..\\a')
 tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a')
 tester('ntpath.relpath("a", "a")', '.')
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -25,7 +25,7 @@
 self.assertRaises(ValueError, urllib2.urlopen, 'bogus url')
 
 # XXX Name hacking to get this to work on Windows.
- fname = os.path.abspath(urllib2.__file__).replace('\\', '/')
+ fname = os.path.abspath(urllib2.__file__).replace(os.sep, '/')
 
 # And more hacking to get it to work on MacOS. This assumes
 # urllib.pathname2url works, unfortunately...
-- 
Repository URL: https://hg.python.org/cpython
