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

diff --git a/Lib/test/support.py b/Lib/test/support.py
index 3bb08d94edea79a0a979dc674f936d7bec5367a5..6096c18a603722d65d178e568fbd7f9b66e53800 100644 (file)
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -351,8 +351,9 @@ else:
             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