diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-20 20:38:20 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-20 20:38:20 (GMT) |
| commit | f38b2b4ab13633d7cc1348ba8b083605a5d41a90 (patch) | |
| tree | ee65bcb0d13bae5382cf7128dbfa3c359ee6ed2d /Lib/test | |
| parent | 7c4afcb1c4cc04d649db648c663fd50189b72034 (diff) | |
| download | cpython-f38b2b4ab13633d7cc1348ba8b083605a5d41a90.zip cpython-f38b2b4ab13633d7cc1348ba8b083605a5d41a90.tar.gz cpython-f38b2b4ab13633d7cc1348ba8b083605a5d41a90.tar.bz2 | |
Merged revisions 79144 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r79144 | florent.xicluna | 2010-03-20 21:30:53 +0100 (sam, 20 mar 2010) | 2 lines
#8133: Use appropriate Unicode decomposition on MacOS X platform.
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_imp.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index c24d465..d66d40e 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -104,7 +104,14 @@ class ImportTests(unittest.TestCase): 'cp1258' : b'\xc0', } - special_char = known_locales.get(fs_encoding) + if sys.platform == 'darwin': + self.assertEqual(fs_encoding, 'utf-8') + # Mac OS X uses the Normal Form D decomposition + # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html + special_char = b'a\xcc\x88' + else: + special_char = known_locales.get(fs_encoding) + if not special_char: self.skipTest("can't run this test with %s as filesystem encoding" % fs_encoding) |