[Python-checkins] r84668 - in python/branches/release31-maint: Lib/test/support.py

[victor.stinner]

Author: victor.stinner
Date: Fri Sep 10 14:19:37 2010
New Revision: 84668

Log:
Merged revisions 84666 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84666 | victor.stinner | 2010-09-10 13:19:59 +0200 (ven., 10 sept. 2010) | 2 lines
  
  Issue #9819: fix TESTFN_UNENCODABLE for japanese code page
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/support.py

Modified: python/branches/release31-maint/Lib/test/support.py
==============================================================================
--- python/branches/release31-maint/Lib/test/support.py	(original)
+++ python/branches/release31-maint/Lib/test/support.py	Fri Sep 10 14:19:37 2010
@@ -351,8 +351,9 @@
             sys.getwindowsversion()[3] < 2): #  0=win32s or 1=9x/ME
         TESTFN_UNICODE_UNENCODEABLE = None
     else:
-        # Japanese characters (I think - from bug 846133)
-        TESTFN_UNICODE_UNENCODEABLE = "@test-\u5171\u6709\u3055\u308c\u308b"
+        # Different kinds of characters from various languages to minimize the
+        # probability that the whole name is encodable to MBCS (issue #9819)
+        TESTFN_UNENCODABLE = TESTFN + "-\u5171\u0141\u2661\u0363\uDC80"
         try:
             # XXX - Note - should be using TESTFN_ENCODING here - but for
             # Windows, "mbcs" currently always operates as if in