Skip to content

gh-80480: array: Add 'w' typecode. #105242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 10 commits into from
Jun 4, 2023
Merged

gh-80480: array: Add 'w' typecode. #105242

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3b2a1af
Implement array('w')
methane Jun 2, 2023
f6fa53e
Update test
methane Jun 2, 2023
20405dc
Use array('w') where possible.
methane Jun 2, 2023
bc68c14
Add NEWS entry
methane Jun 2, 2023
421aabf
Update array document.
methane Jun 2, 2023
11f093b
Add What's new entry.
methane Jun 2, 2023
1767520
Fix test fail on Windows
methane Jun 2, 2023
d1ee790
Suppress unused variable warning
methane Jun 3, 2023
2580214
whatsnew: sort by module name
methane Jun 4, 2023
f2681f9
Merge branch 'main' into array-w
methane Jun 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update test
  • Loading branch information
@methane
methane committed Jun 2, 2023
commit f6fa53efa9298cc5bc2feb5f1ed585de0dd3097f
43 changes: 25 additions & 18 deletions Lib/test/test_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ArraySubclassWithKwargs(array.array):
def __init__(self, typecode, newarg=None):
array.array.__init__(self)

typecodes = 'ubBhHiIlLfdqQ'
typecodes = 'uwbBhHiIlLfdqQ'

class MiscTest(unittest.TestCase):

Expand Down Expand Up @@ -186,11 +186,12 @@ def test_unicode(self):
)
for testcase in testcases:
mformat_code, encoding = testcase
a = array.array('u', teststr)
b = array_reconstructor(
array.array, 'u', mformat_code, teststr.encode(encoding))
self.assertEqual(a, b,
msg="{0!r} != {1!r}; testcase={2!r}".format(a, b, testcase))
for c in 'uw':
a = array.array(c, teststr)
b = array_reconstructor(
array.array, c, mformat_code, teststr.encode(encoding))
self.assertEqual(a, b,
msg="{0!r} != {1!r}; testcase={2!r}".format(a, b, testcase))


class BaseTest:
Expand Down Expand Up @@ -234,7 +235,7 @@ def test_buffer_info(self):
self.assertEqual(bi[1], len(a))

def test_byteswap(self):
if self.typecode == 'u':
if self.typecode in ('u', 'w'):
example = '\U00100100'
else:
example = self.example
Expand Down Expand Up @@ -1079,7 +1080,7 @@ def test_buffer(self):
self.assertEqual(m.tobytes(), expected)
self.assertRaises(BufferError, a.frombytes, a.tobytes())
self.assertEqual(m.tobytes(), expected)
if self.typecode == 'u':
if self.typecode in ('u', 'w'):
self.assertRaises(BufferError, a.fromunicode, a.tounicode())
self.assertEqual(m.tobytes(), expected)
self.assertRaises(BufferError, operator.imul, a, 2)
Expand Down Expand Up @@ -1135,7 +1136,7 @@ def test_sizeof_without_buffer(self):
support.check_sizeof(self, a, basesize)

def test_initialize_with_unicode(self):
if self.typecode != 'u':
if self.typecode not in ('u', 'w'):
with self.assertRaises(TypeError) as cm:
a = array.array(self.typecode, 'foo')
self.assertIn("cannot use a str", str(cm.exception))
Expand All @@ -1145,6 +1146,7 @@ def test_initialize_with_unicode(self):
else:
a = array.array(self.typecode, "foo")
a = array.array(self.typecode, array.array('u', 'foo'))
a = array.array(self.typecode, array.array('w', 'foo'))

@support.cpython_only
def test_obsolete_write_lock(self):
Expand Down Expand Up @@ -1176,7 +1178,7 @@ class UnicodeTest(StringTest, unittest.TestCase):
def test_unicode(self):
self.assertRaises(TypeError, array.array, 'b', 'foo')

a = array.array('u', '\xa0\xc2\u1234')
a = array.array(self.typecode, '\xa0\xc2\u1234')
a.fromunicode(' ')
a.fromunicode('')
a.fromunicode('')
Expand All @@ -1186,25 +1188,30 @@ def test_unicode(self):
self.assertEqual(a.itemsize, sizeof_wchar)

s = '\x00="\'a\\b\x80\xff\u0000\u0001\u1234'
a = array.array('u', s)
a = array.array(self.typecode, s)
self.assertEqual(
repr(a),
"array('u', '\\x00=\"\\'a\\\\b\\x80\xff\\x00\\x01\u1234')")
f"array('{self.typecode}', '\\x00=\"\\'a\\\\b\\x80\xff\\x00\\x01\u1234')")

self.assertRaises(TypeError, a.fromunicode)

def test_issue17223(self):
# this used to crash
if sizeof_wchar == 4:
# U+FFFFFFFF is an invalid code point in Unicode 6.0
invalid_str = b'\xff\xff\xff\xff'
else:
if self.typecode == 'u' and sizeof_wchar == 2:
# PyUnicode_FromUnicode() cannot fail with 16-bit wchar_t
self.skipTest("specific to 32-bit wchar_t")
a = array.array('u', invalid_str)

# this used to crash
# U+FFFFFFFF is an invalid code point in Unicode 6.0
invalid_str = b'\xff\xff\xff\xff'

a = array.array(self.typecode, invalid_str)
self.assertRaises(ValueError, a.tounicode)
self.assertRaises(ValueError, str, a)

class UCS4Test(UnicodeTest):
typecode = 'w'
minitemsize = 4

class NumberTest(BaseTest):

def test_extslice(self):
Expand Down