This commit is contained in:
Mark Dickinson 2011-03-26 10:22:56 +00:00
commit 657bd0a25d
3 changed files with 22 additions and 1 deletions

View File

@ -80,7 +80,9 @@ def RawArray(typecode_or_type, size_or_initializer):
type_ = typecode_to_type.get(typecode_or_type, typecode_or_type) type_ = typecode_to_type.get(typecode_or_type, typecode_or_type)
if isinstance(size_or_initializer, int): if isinstance(size_or_initializer, int):
type_ = type_ * size_or_initializer type_ = type_ * size_or_initializer
return _new_value(type_) obj = _new_value(type_)
ctypes.memset(ctypes.addressof(obj), 0, ctypes.sizeof(obj))
return obj
else: else:
type_ = type_ * len(size_or_initializer) type_ = type_ * len(size_or_initializer)
result = _new_value(type_) result = _new_value(type_)

View File

@ -928,6 +928,21 @@ class _TestArray(BaseTestCase):
self.assertEqual(list(arr[:]), seq) self.assertEqual(list(arr[:]), seq)
@unittest.skipIf(c_int is None, "requires _ctypes")
def test_array_from_size(self):
size = 10
# Test for zeroing (see issue #11675).
# The repetition below strengthens the test by increasing the chances
# of previously allocated non-zero memory being used for the new array
# on the 2nd and 3rd loops.
for _ in range(3):
arr = self.Array('i', size)
self.assertEqual(len(arr), size)
self.assertEqual(list(arr), [0] * size)
arr[:] = range(10)
self.assertEqual(list(arr), list(range(10)))
del arr
@unittest.skipIf(c_int is None, "requires _ctypes") @unittest.skipIf(c_int is None, "requires _ctypes")
def test_rawarray(self): def test_rawarray(self):
self.test_array(raw=True) self.test_array(raw=True)

View File

@ -10,6 +10,10 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #11675: multiprocessing.[Raw]Array objects created from an integer size
are now zeroed on creation. This matches the behaviour specified by the
documentation.
- Issue #10998: Remove mentions of -Q, sys.flags.division_warning and - Issue #10998: Remove mentions of -Q, sys.flags.division_warning and
Py_DivisionWarningFlag left over from Python 2. Py_DivisionWarningFlag left over from Python 2.