[Python-checkins] cpython (merge default -> default): Merge.
stefan.krah
python-checkins at python.org
Tue Nov 6 23:56:40 CET 2012
http://hg.python.org/cpython/rev/55e58e2bf95c
changeset: 80285:55e58e2bf95c
parent: 80284:80f51c128d08
parent: 80281:7f90305d9f23
user: Stefan Krah <skrah at bytereef.org>
date: Tue Nov 06 23:55:58 2012 +0100
summary:
Merge.
files:
Lib/test/support.py | 37 ++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -607,20 +607,37 @@
# or None if there is no such character.
FS_NONASCII = None
for character in (
- # U+00E6 (Latin small letter AE): Encodable to cp1252, cp1254, cp1257, iso-8859-1
+ # First try printable and common characters to have a readable filename.
+ # For each character, the encoding list are just example of encodings able
+ # to encode the character (the list is not exhaustive).
+
+ # U+00E6 (Latin Small Letter Ae): cp1252, iso-8859-1
'\u00E6',
- # U+0141 (Latin capital letter L with stroke): Encodable to cp1250, cp1257
+ # U+0130 (Latin Capital Letter I With Dot Above): cp1254, iso8859_3
+ '\u0130',
+ # U+0141 (Latin Capital Letter L With Stroke): cp1250, cp1257
'\u0141',
- # U+041A (Cyrillic capital letter KA): Encodable to cp932, cp950, cp1251
+ # U+03C6 (Greek Small Letter Phi): cp1253
+ '\u03C6',
+ # U+041A (Cyrillic Capital Letter Ka): cp1251
'\u041A',
- # U+05D0 (Hebrew Letter Alef): Encodable to cp424, cp1255
+ # U+05D0 (Hebrew Letter Alef): Encodable to cp424
'\u05D0',
- # U+06A9 (Arabic letter KEHEH): Encodable to cp1256
- '\u06A9',
- # U+03A9 (Greek capital letter OMEGA): Encodable to cp932, cp950, cp1253
- '\u03A9',
- # U+0E01 (Thai character KO KAI): Encodable to cp874
+ # U+060C (Arabic Comma): cp864, cp1006, iso8859_6, mac_arabic
+ '\u060C',
+ # U+062A (Arabic Letter Teh): cp720
+ '\u062A',
+ # U+0E01 (Thai Character Ko Kai): cp874
'\u0E01',
+
+ # Then try more "special" characters. "special" because they may be
+ # interpreted or displayed differently depending on the exact locale
+ # encoding and the font.
+
+ # U+00A0 (No-Break Space)
+ '\u00A0',
+ # U+20AC (Euro Sign)
+ '\u20AC',
):
try:
os.fsdecode(os.fsencode(character))
@@ -689,7 +706,7 @@
break
if FS_NONASCII:
- TESTFN_NONASCII = TESTFN + '- ' + FS_NONASCII
+ TESTFN_NONASCII = TESTFN + '-' + FS_NONASCII
else:
TESTFN_NONASCII = None
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list