Patch 520694: arraymodule.c improvements:
- make array.array a type
- add Py_UNICODE arrays
- support +=, *=
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 087e65b..d3e115f 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -6,14 +6,87 @@
from test_support import verbose, TESTFN, unlink, TestFailed
def main():
-
testtype('c', 'c')
-
+ testtype('u', u'\u263a')
for type in (['b', 'h', 'i', 'l', 'f', 'd']):
testtype(type, 1)
-
+ testunicode()
+ testsubclassing()
unlink(TESTFN)
+def testunicode():
+ try:
+ array.array('b', u'foo')
+ except TypeError:
+ pass
+ else:
+ raise TestFailed("creating a non-unicode array from "
+ "a Unicode string should fail")
+
+ x = array.array('u', u'\xa0\xc2\u1234')
+ x.fromunicode(u' ')
+ x.fromunicode(u'')
+ x.fromunicode(u'')
+ x.fromunicode(u'\x11abc\xff\u1234')
+ s = x.tounicode()
+ if s != u'\xa0\xc2\u1234 \x11abc\xff\u1234':
+ raise TestFailed("fromunicode()/tounicode()")
+
+ s = u'\x00="\'a\\b\x80\xff\u0000\u0001\u1234'
+ a = array.array('u', s)
+ if verbose:
+ print "repr of type 'u' array:", repr(a)
+ print " expected: array('u', %r)" % s
+
+def testsubclassing():
+ class EditableString(array.array):
+ def __new__(cls, s, *args, **kwargs):
+ return array.array.__new__(cls, 'c', s)
+
+ def __init__(self, s, color='blue'):
+ array.array.__init__(self, 'c', s)
+ self.color = color
+
+ def strip(self):
+ self[:] = array.array('c', self.tostring().strip())
+
+ def __repr__(self):
+ return 'EditableString(%r)' % self.tostring()
+
+ s = EditableString("\ttest\r\n")
+ s.strip()
+ if s.tostring() != 'test':
+ raise TestFailed, "subclassing array.array failed somewhere"
+ if s.color != 'blue':
+ raise TestFailed, "assigning attributes to instance of array subclass"
+ s.color = 'red'
+ if s.color != 'red':
+ raise TestFailed, "assigning attributes to instance of array subclass"
+ if s.__dict__.keys() != ['color']:
+ raise TestFailed, "array subclass __dict__"
+
+ class ExaggeratingArray(array.array):
+ __slots__ = ['offset']
+
+ def __new__(cls, typecode, data, offset):
+ return array.array.__new__(cls, typecode, data)
+
+ def __init__(self, typecode, data, offset):
+ self.offset = offset
+
+ def __getitem__(self, i):
+ return array.array.__getitem__(self, i) + self.offset
+
+ a = ExaggeratingArray('i', [3, 6, 7, 11], 4)
+ if a[0] != 7:
+ raise TestFailed, "array subclass overriding __getitem__"
+ try:
+ a.color = 'blue'
+ except AttributeError:
+ pass
+ else:
+ raise TestFailed, "array subclass __slots__ was ignored"
+
def testoverflow(type, lowerLimit, upperLimit):
# should not overflow assigning lower limit
@@ -54,7 +127,6 @@
def testtype(type, example):
-
a = array.array(type)
a.append(example)
if verbose:
@@ -97,6 +169,33 @@
print 'array of %s converted to a string: ' \
% a.typecode, `a.tostring()`
+ # Try out inplace addition and multiplication
+ a = array.array(type, [example])
+ b = a
+ a += array.array(type, [example]*2)
+ if a is not b:
+ raise TestFailed, "array(%s) inplace addition" % `type`
+ if a != array.array(type, [example] * 3):
+ raise TestFailed, "array(%s) inplace addition" % `type`
+
+ a *= 5
+ if a is not b:
+ raise TestFailed, "array(%s) inplace multiplication" % `type`
+ if a != array.array(type, [example] * 15):
+ raise TestFailed, "array(%s) inplace multiplication" % `type`
+
+ a *= 0
+ if a is not b:
+ raise TestFailed, "array(%s) inplace multiplication by 0" % `type`
+ if a != array.array(type, []):
+ raise TestFailed, "array(%s) inplace multiplication by 0" % `type`
+
+ a *= 1000
+ if a is not b:
+ raise TestFailed, "empty array(%s) inplace multiplication" % `type`
+ if a != array.array(type, []):
+ raise TestFailed, "empty array(%s) inplace multiplication" % `type`
+
if type == 'c':
a = array.array(type, "abcde")
a[:-1] = a
@@ -135,6 +234,44 @@
a.reverse()
if a != array.array(type, "dca"):
raise TestFailed, "array(%s) reverse-test" % `type`
+ elif type == 'u':
+ a = array.array(type, u"abcde")
+ a[:-1] = a
+ if a != array.array(type, u"abcdee"):
+ raise TestFailed, "array(%s) self-slice-assign (head)" % `type`
+ a = array.array(type, u"abcde")
+ a[1:] = a
+ if a != array.array(type, u"aabcde"):
+ raise TestFailed, "array(%s) self-slice-assign (tail)" % `type`
+ a = array.array(type, u"abcde")
+ a[1:-1] = a
+ if a != array.array(type, u"aabcdee"):
+ raise TestFailed, "array(%s) self-slice-assign (cntr)" % `type`
+ if a.index(u"e") != 5:
+ raise TestFailed, "array(%s) index-test" % `type`
+ if a.count(u"a") != 2:
+ raise TestFailed, "array(%s) count-test" % `type`
+ a.remove(u"e")
+ if a != array.array(type, u"aabcde"):
+ raise TestFailed, "array(%s) remove-test" % `type`
+ if a.pop(0) != u"a":
+ raise TestFailed, "array(%s) pop-test" % `type`
+ if a.pop(1) != u"b":
+ raise TestFailed, "array(%s) pop-test" % `type`
+ a.extend(array.array(type, u"xyz"))
+ if a != array.array(type, u"acdexyz"):
+ raise TestFailed, "array(%s) extend-test" % `type`
+ a.pop()
+ a.pop()
+ a.pop()
+ x = a.pop()
+ if x != u'e':
+ raise TestFailed, "array(%s) pop-test" % `type`
+ if a != array.array(type, u"acd"):
+ raise TestFailed, "array(%s) pop-test" % `type`
+ a.reverse()
+ if a != array.array(type, u"dca"):
+ raise TestFailed, "array(%s) reverse-test" % `type`
else:
a = array.array(type, [1, 2, 3, 4, 5])
a[:-1] = a