summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-09-10 12:19:37 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-09-10 12:19:37 (GMT)
commit0d823ed434b594b52a9fdf02fb862bd960c7c5c3 (patch)
tree6c226fece2f05fe1af4ec173b209a13f92f0ce60 /Lib
parent13bba43e25da2f18121be5b245db8249b4a8cdc5 (diff)
downloadcpython-0d823ed434b594b52a9fdf02fb862bd960c7c5c3.zip
cpython-0d823ed434b594b52a9fdf02fb862bd960c7c5c3.tar.gz
cpython-0d823ed434b594b52a9fdf02fb862bd960c7c5c3.tar.bz2
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 ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/support.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 3bb08d9..6096c18 100644
--- 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