[Python-checkins] r84080 - python/branches/py3k/Lib/test/support.py

[victor.stinner]

Author: victor.stinner
Date: Sun Aug 15 21:28:21 2010
New Revision: 84080

Log:
Fix TESTFN_UNENCODABLE of test.support on Mac OS X


Modified:
   python/branches/py3k/Lib/test/support.py

Modified: python/branches/py3k/Lib/test/support.py
==============================================================================
--- python/branches/py3k/Lib/test/support.py	(original)
+++ python/branches/py3k/Lib/test/support.py	Sun Aug 15 21:28:21 2010
@@ -386,11 +386,10 @@
 # TESTFN_UNENCODABLE is a filename (str type) that should *not* be able to be
 # encoded by the filesystem encoding (in strict mode). It can be None if we
 # cannot generate such filename.
+TESTFN_UNENCODABLE = None
 if os.name in ('nt', 'ce'):
-    if sys.getwindowsversion().platform < 2:
-        # win32s (0) or Windows 9x/ME (1)
-        TESTFN_UNENCODABLE = None
-    else:
+    # skip win32s (0) or Windows 9x/ME (1)
+    if sys.getwindowsversion().platform >= 2:
         # Japanese characters (I think - from bug 846133)
         TESTFN_UNENCODABLE = TESTFN + "-\u5171\u6709\u3055\u308c\u308b"
         try:
@@ -402,8 +401,8 @@
                   'Unicode filename tests may not be effective'
                   % (TESTFN_UNENCODABLE, TESTFN_ENCODING))
             TESTFN_UNENCODABLE = None
+# Mac OS X denies unencodable filenames (invalid utf-8)
 elif sys.platform != 'darwin':
-    # Mac OS X denies unencodable filenames (invalid utf-8)
     try:
         # ascii and utf-8 cannot encode the byte 0xff
         b'\xff'.decode(TESTFN_ENCODING)
@@ -414,7 +413,7 @@
     else:
         # File system encoding (eg. ISO-8859-* encodings) can encode
         # the byte 0xff. Skip some unicode filename tests.
-        TESTFN_UNENCODABLE = None
+        pass
 
 # Save the initial cwd
 SAVEDCWD = os.getcwd()