diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-08-09 00:22:57 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-08-09 00:22:57 (GMT) |
| commit | 652e758fc41c953c5235f389e7dbb481bc915f0a (patch) | |
| tree | 2c87e935f9bbfe79d391ccfd31e32bc126a4327f /Lib/test/test_array.py | |
| parent | 1a1367b821ee6e724cc4d66934f93d84d8544161 (diff) | |
| parent | 9d512ab97f642215c16eace1705f585f41eb4162 (diff) | |
| download | cpython-652e758fc41c953c5235f389e7dbb481bc915f0a.zip cpython-652e758fc41c953c5235f389e7dbb481bc915f0a.tar.gz cpython-652e758fc41c953c5235f389e7dbb481bc915f0a.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/test/test_array.py')
| -rwxr-xr-x | Lib/test/test_array.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index 9385339..eb6d77f 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -1029,9 +1029,19 @@ class UnicodeTest(StringTest): smallerexample = '\x01\u263a\x00\ufefe' biggerexample = '\x01\u263a\x01\ufeff' outside = str('\x33') - minitemsize = 4 + minitemsize = 2 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') a = array.array('u', '\xa0\xc2\u1234') @@ -1041,7 +1051,7 @@ class UnicodeTest(StringTest): a.fromunicode('\x11abc\xff\u1234') s = a.tounicode() self.assertEqual(s, '\xa0\xc2\u1234 \x11abc\xff\u1234') - self.assertEqual(a.itemsize, 4) + self.assertEqual(a.itemsize, sizeof_wchar) s = '\x00="\'a\\b\x80\xff\u0000\u0001\u1234' a = array.array('u', s) |