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.
........

Lib/test/test_imp.py

@@ -104,7 +104,14 @@ class ImportTests(unittest.TestCase):
             'cp1258' : b'\xc0',
             }
 
+        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)