From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 18 Aug 2010 21:06:23 +0000 (+0000)
Subject: Decompose TESTFN_UNICODE on Mac OS X
X-Git-Tag: v3.2a2~225
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74a833fa9683283e722638fc3cd4cdd1aca160e5;p=thirdparty%2FPython%2Fcpython.git

Decompose TESTFN_UNICODE on Mac OS X
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index a70fee48cfbd..d0e84c72ab7d 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -379,6 +379,12 @@ TESTFN = "{}_{}_tmp".format(TESTFN, os.getpid())
 
 # TESTFN_UNICODE is a non-ascii filename
 TESTFN_UNICODE = TESTFN + "-\xe0\xf2\u0258\u0141\u011f"
+if sys.platform == 'darwin':
+    # In Mac OS X's VFS API file names are, by definition, canonically
+    # decomposed Unicode, encoded using UTF-8. See QA1173:
+    # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html
+    import unicodedata
+    TESTFN_UNICODE = unicodedata.normalize('NFD', TESTFN_UNICODE)
 TESTFN_ENCODING = sys.getfilesystemencoding()
 
 # TESTFN_UNENCODABLE is a filename (str type) that should *not* be able to be