diff options
Diffstat (limited to 'Lib/test/test_pep277.py')
| -rw-r--r-- | Lib/test/test_pep277.py | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/Lib/test/test_pep277.py b/Lib/test/test_pep277.py index 92b82d0f7d2..6d891e541ee 100644 --- a/Lib/test/test_pep277.py +++ b/Lib/test/test_pep277.py @@ -2,20 +2,20 @@ # open, os.open, os.stat. os.listdir, os.rename, os.remove, os.mkdir, os.chdir, os.rmdir import sys, os, unittest from unicodedata import normalize -from test import test_support +from test import support filenames = [ '1_abc', - u'2_ascii', - u'3_Gr\xfc\xdf-Gott', - u'4_\u0393\u03b5\u03b9\u03ac-\u03c3\u03b1\u03c2', - u'5_\u0417\u0434\u0440\u0430\u0432\u0441\u0442\u0432\u0443\u0439\u0442\u0435', - u'6_\u306b\u307d\u3093', - u'7_\u05d4\u05e9\u05e7\u05e6\u05e5\u05e1', - u'8_\u66e8\u66e9\u66eb', - u'9_\u66e8\u05e9\u3093\u0434\u0393\xdf', + '2_ascii', + '3_Gr\xfc\xdf-Gott', + '4_\u0393\u03b5\u03b9\u03ac-\u03c3\u03b1\u03c2', + '5_\u0417\u0434\u0440\u0430\u0432\u0441\u0442\u0432\u0443\u0439\u0442\u0435', + '6_\u306b\u307d\u3093', + '7_\u05d4\u05e9\u05e7\u05e6\u05e5\u05e1', + '8_\u66e8\u66e9\u66eb', + '9_\u66e8\u05e9\u3093\u0434\u0393\xdf', # Specific code points: fn, NFC(fn) and NFKC(fn) all differents - u'10_\u1fee\u1ffd', + '10_\u1fee\u1ffd', ] # Mac OS X decomposes Unicode names, using Normal Form D. @@ -27,24 +27,24 @@ filenames = [ if sys.platform != 'darwin': filenames.extend([ # Specific code points: NFC(fn), NFD(fn), NFKC(fn) and NFKD(fn) all differents - u'11_\u0385\u03d3\u03d4', - u'12_\u00a8\u0301\u03d2\u0301\u03d2\u0308', # == NFD(u'\u0385\u03d3\u03d4') - u'13_\u0020\u0308\u0301\u038e\u03ab', # == NFKC(u'\u0385\u03d3\u03d4') - u'14_\u1e9b\u1fc1\u1fcd\u1fce\u1fcf\u1fdd\u1fde\u1fdf\u1fed', + '11_\u0385\u03d3\u03d4', + '12_\u00a8\u0301\u03d2\u0301\u03d2\u0308', # == NFD('\u0385\u03d3\u03d4') + '13_\u0020\u0308\u0301\u038e\u03ab', # == NFKC('\u0385\u03d3\u03d4') + '14_\u1e9b\u1fc1\u1fcd\u1fce\u1fcf\u1fdd\u1fde\u1fdf\u1fed', # Specific code points: fn, NFC(fn) and NFKC(fn) all differents - u'15_\u1fee\u1ffd\ufad1', - u'16_\u2000\u2000\u2000A', - u'17_\u2001\u2001\u2001A', - u'18_\u2003\u2003\u2003A', # == NFC(u'\u2001\u2001\u2001A') - u'19_\u0020\u0020\u0020A', # u'\u0020' == u' ' == NFKC(u'\u2000') == - # NFKC(u'\u2001') == NFKC(u'\u2003') + '15_\u1fee\u1ffd\ufad1', + '16_\u2000\u2000\u2000A', + '17_\u2001\u2001\u2001A', + '18_\u2003\u2003\u2003A', # == NFC('\u2001\u2001\u2001A') + '19_\u0020\u0020\u0020A', # '\u0020' == ' ' == NFKC('\u2000') == + # NFKC('\u2001') == NFKC('\u2003') ]) # Is it Unicode-friendly? if not os.path.supports_unicode_filenames: - fsencoding = sys.getfilesystemencoding() or sys.getdefaultencoding() + fsencoding = sys.getfilesystemencoding() try: for name in filenames: name.encode(fsencoding) @@ -59,7 +59,7 @@ def deltree(dirname): # an error if we can't remove it. if os.path.exists(dirname): # must pass unicode to os.listdir() so we get back unicode results. - for fname in os.listdir(unicode(dirname)): + for fname in os.listdir(str(dirname)): os.unlink(os.path.join(dirname, fname)) os.rmdir(dirname) @@ -70,23 +70,23 @@ class UnicodeFileTests(unittest.TestCase): def setUp(self): try: - os.mkdir(test_support.TESTFN) + os.mkdir(support.TESTFN) except OSError: pass files = set() for name in self.files: - name = os.path.join(test_support.TESTFN, self.norm(name)) - with open(name, 'w') as f: + name = os.path.join(support.TESTFN, self.norm(name)) + with open(name, 'wb') as f: f.write((name+'\n').encode("utf-8")) os.stat(name) files.add(name) self.files = files def tearDown(self): - deltree(test_support.TESTFN) + deltree(support.TESTFN) def norm(self, s): - if self.normal_form and isinstance(s, unicode): + if self.normal_form: return normalize(self.normal_form, s) return s @@ -96,11 +96,11 @@ class UnicodeFileTests(unittest.TestCase): fn(filename) exc_filename = c.exception.filename # the "filename" exception attribute may be encoded - if isinstance(exc_filename, str): + if isinstance(exc_filename, bytes): filename = filename.encode(sys.getfilesystemencoding()) if check_fn_in_exception: - self.assertEqual(exc_filename, filename, "Function '%s(%r) failed " - "with bad filename in the exception: %r" % + self.assertEqual(exc_filename, filename, "Function '%s(%a) failed " + "with bad filename in the exception: %a" % (fn.__name__, filename, exc_filename)) def test_failures(self): @@ -117,7 +117,7 @@ class UnicodeFileTests(unittest.TestCase): def test_open(self): for name in self.files: - f = open(name, 'w') + f = open(name, 'wb') f.write((name+'\n').encode("utf-8")) f.close() os.stat(name) @@ -126,9 +126,9 @@ class UnicodeFileTests(unittest.TestCase): # NFD (a variant of Unicode NFD form). Normalize the filename to NFC, NFKC, # NFKD in Python is useless, because darwin will normalize it later and so # open(), os.stat(), etc. don't raise any exception. - @unittest.skipIf(sys.platform == 'darwin', 'irrelevant test on Mac OS X') + @unittest.skipIf(sys.platform == 'darwin', 'irrevelant test on Mac OS X') def test_normalize(self): - files = set(f for f in self.files if isinstance(f, unicode)) + files = set(self.files) others = set() for nf in set(['NFC', 'NFD', 'NFKC', 'NFKD']): others |= set(normalize(nf, file) for file in files) @@ -145,14 +145,13 @@ class UnicodeFileTests(unittest.TestCase): # Skip the test on darwin, because darwin uses a normalization different # than Python NFD normalization: filenames are different even if we use # Python NFD normalization. - @unittest.skipIf(sys.platform == 'darwin', 'irrelevant test on Mac OS X') + @unittest.skipIf(sys.platform == 'darwin', 'irrevelant test on Mac OS X') def test_listdir(self): sf0 = set(self.files) - f1 = os.listdir(test_support.TESTFN) - f2 = os.listdir(unicode(test_support.TESTFN, - sys.getfilesystemencoding())) - sf2 = set(os.path.join(unicode(test_support.TESTFN), f) for f in f2) - self.assertEqual(sf0, sf2) + f1 = os.listdir(support.TESTFN.encode(sys.getfilesystemencoding())) + f2 = os.listdir(support.TESTFN) + sf2 = set(os.path.join(support.TESTFN, f) for f in f2) + self.assertEqual(sf0, sf2, "%a != %a" % (sf0, sf2)) self.assertEqual(len(f1), len(f2)) def test_rename(self): @@ -161,14 +160,13 @@ class UnicodeFileTests(unittest.TestCase): os.rename("tmp", name) def test_directory(self): - dirname = os.path.join(test_support.TESTFN, - u'Gr\xfc\xdf-\u66e8\u66e9\u66eb') - filename = u'\xdf-\u66e8\u66e9\u66eb' + dirname = os.path.join(support.TESTFN, 'Gr\xfc\xdf-\u66e8\u66e9\u66eb') + filename = '\xdf-\u66e8\u66e9\u66eb' oldwd = os.getcwd() os.mkdir(dirname) os.chdir(dirname) try: - with open(filename, 'w') as f: + with open(filename, 'wb') as f: f.write((filename + '\n').encode("utf-8")) os.access(filename,os.R_OK) os.remove(filename) @@ -195,7 +193,7 @@ class UnicodeNFKDFileTests(UnicodeFileTests): def test_main(): try: - test_support.run_unittest( + support.run_unittest( UnicodeFileTests, UnicodeNFCFileTests, UnicodeNFDFileTests, @@ -203,7 +201,7 @@ def test_main(): UnicodeNFKDFileTests, ) finally: - deltree(test_support.TESTFN) + deltree(support.TESTFN) if __name__ == "__main__": |