Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 07:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

(Merge 3.3) Issue #17223: Fix test_array on Windows (16-bit wchar_t/Py_UNICODE)

Browse source
This commit is contained in:
Victor Stinner 2013-02-26 22:52:25 +01:00
commit 742c5961dd
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Lib/test/test_array.py
View file

@ -24,6 +24,17 @@
except struct.error: except struct.error:
have_long_long = False 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
class ArraySubclass(array.array): class ArraySubclass(array.array):
pass pass
@ -1040,16 +1051,6 @@ class UnicodeTest(StringTest, unittest.TestCase):
minitemsize = 2 minitemsize = 2
def test_unicode(self): def test_unicode(self):
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
self.assertRaises(TypeError, array.array, 'b', 'foo') self.assertRaises(TypeError, array.array, 'b', 'foo')
a = array.array('u', '\xa0\xc2\u1234') a = array.array('u', '\xa0\xc2\u1234')
@ -1071,7 +1072,13 @@ def test_unicode(self):
def test_issue17223(self): def test_issue17223(self):
# this used to crash # this used to crash
a = array.array('u', b'\xff' * 4) if sizeof_wchar == 4:
# 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'
a = array.array('u', invalid_str)
self.assertRaises(ValueError, a.tounicode) self.assertRaises(ValueError, a.tounicode)
self.assertRaises(ValueError, str, a) self.assertRaises(ValueError, str, a)