r78689 enabled the test on more platforms but the buildbot did not like it. Using the filesystem encoding might work better. Also see #5604.

This commit is contained in:
Ezio Melotti 2010-03-05 15:08:19 +00:00
parent e0f83e89e1
commit 76e0d1a6ef

View File

@ -1,5 +1,4 @@
import imp import imp
import locale
import os import os
import os.path import os.path
import sys import sys
@ -86,7 +85,7 @@ class ImportTests(unittest.TestCase):
# But sources modified to follow generic way for processing pathes. # But sources modified to follow generic way for processing pathes.
# the return encoding can be uppercase # the return encoding can be uppercase
locale_encoding = locale.getpreferredencoding().lower() fs_encoding = sys.getfilesystemencoding().lower()
# covers utf-8 and Windows ANSI code pages # covers utf-8 and Windows ANSI code pages
# one non-space symbol from every page # one non-space symbol from every page
@ -104,11 +103,11 @@ class ImportTests(unittest.TestCase):
'cp1258' : b'\xc0', 'cp1258' : b'\xc0',
} }
special_char = known_locales.get(locale_encoding) special_char = known_locales.get(fs_encoding)
if not special_char: if not special_char:
self.skipTest("can't run this test with %s as preferred encoding" self.skipTest("can't run this test with %s as filesystem encoding"
% locale_encoding) % fs_encoding)
decoded_char = special_char.decode(locale_encoding) decoded_char = special_char.decode(fs_encoding)
temp_mod_name = 'test_imp_helper_' + decoded_char temp_mod_name = 'test_imp_helper_' + decoded_char
test_package_name = 'test_imp_helper_package_' + decoded_char test_package_name = 'test_imp_helper_package_' + decoded_char
init_file_name = os.path.join(test_package_name, '__init__.py') init_file_name = os.path.join(test_package_name, '__init__.py')