mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-26 19:34:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Mark Hammond to fix a test error.

Browse Source 
Now runs without exception on WinME/98.
This commit is contained in:
Raymond Hettinger 2004-06-28 06:57:19 +00:00
parent 19699a9351
commit 3b04ce824d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/test/test_unicode_file.py
View File

@ -39,17 +39,20 @@ class TestUnicodeFiles(unittest.TestCase):
os.path.abspath(filename)==os.path.abspath(glob.glob(filename)[0]))
# basename should appear in listdir.
path, base = os.path.split(os.path.abspath(filename))
if (isinstance (filename, str)):
new_base = base.decode(TESTFN_ENCODING)
file_list = [f.decode(TESTFN_ENCODING) for f in os.listdir(path)]
else:
new_base = base
file_list = os.listdir(path)
if isinstance(base, str):
base = base.decode(TESTFN_ENCODING)
file_list = os.listdir(path)
# listdir() with a unicode arg may or may not return Unicode
# objects, depending on the platform.
if file_list and isinstance(file_list[0], str):
file_list = [f.decode(TESTFN_ENCODING) for f in file_list]
new_base = unicodedata.normalize("NFD", new_base)
# Normalize the unicode strings, as round-tripping the name via the OS
# may return a different (but equivalent) value.
base = unicodedata.normalize("NFD", base)
file_list = [unicodedata.normalize("NFD", f) for f in file_list]
self.failUnless(new_base in file_list)
self.failUnless(base in file_list)
# Do as many "equivalancy' tests as we can - ie, check that although we
# have different types for the filename, they refer to the same file.