(original) (raw)

changeset: 82541:42970cbfc982 parent: 82539:9aafc005a611 parent: 82540:1fd165883a65 user: Victor Stinner victor.stinner@gmail.com date: Fri Mar 08 02:33:44 2013 +0100 files: Lib/test/test_array.py description: (Merge 3.3) Issue #17223: the test is specific to 32-bit wchar_t type Skip the test on Windows. diff -r 9aafc005a611 -r 42970cbfc982 Lib/test/test_array.py --- a/Lib/test/test_array.py Thu Mar 07 18:17:19 2013 -0500 +++ b/Lib/test/test_array.py Fri Mar 08 02:33:44 2013 +0100 @@ -24,15 +24,7 @@ except struct.error: have_long_long = False -try: - import ctypes - sizeof_wchar = ctypes.sizeof(ctypes.c_wchar) -except ImportError: - import sys - if sys.platform == 'win32': - sizeof_wchar = 2 - else: - sizeof_wchar = 4 +sizeof_wchar = array.array('u').itemsize class ArraySubclass(array.array): @@ -1076,8 +1068,8 @@ # U+FFFFFFFF is an invalid code point in Unicode 6.0 invalid_str = b'\xff\xff\xff\xff' else: - # invalid UTF-16 surrogate pair - invalid_str = b'\xff\xdf\x61\x00' + # PyUnicode_FromUnicode() cannot fail with 16-bit wchar_t + self.skipTest("specific to 32-bit wchar_t") a = array.array('u', invalid_str) self.assertRaises(ValueError, a.tounicode) self.assertRaises(ValueError, str, a) /victor.stinner@gmail.com