Merged revisions 78247 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78247 | ezio.melotti | 2010-02-20 10:09:39 +0200 (Sat, 20 Feb 2010) | 1 line
#3426: os.path.abspath now returns unicode when its arg is unicode.
........
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index c2f3a4a..ef3429f 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -390,6 +390,21 @@
def test_abspath(self):
self.assert_("foo" in posixpath.abspath("foo"))
+ # Issue 3426: check that abspath retuns unicode when the arg is unicode
+ # and str when it's str, with both ASCII and non-ASCII cwds
+ saved_cwd = os.getcwd()
+ for cwd in (u'cwd', u'\xe7w\xf0'):
+ try:
+ os.mkdir(cwd)
+ os.chdir(cwd)
+ for path in ('', 'foo', 'f\xf2\xf2', '/foo', 'C:\\'):
+ self.assertTrue(isinstance(posixpath.abspath(path), str))
+ for upath in (u'', u'fuu', u'f\xf9\xf9', u'/fuu', u'U:\\'):
+ self.assertTrue(isinstance(posixpath.abspath(upath), unicode))
+ finally:
+ os.chdir(saved_cwd)
+ os.rmdir(cwd)
+
self.assertRaises(TypeError, posixpath.abspath)
def test_realpath(self):