mirror of https://github.com/python/cpython
Issue #19014: memoryview.cast() is now allowed on zero-length views.
This commit is contained in:
parent
def0a4c298
commit
60b183407c
|
@ -2432,15 +2432,22 @@ class TestBufferProtocol(unittest.TestCase):
|
||||||
self.assertRaises(ValueError, get_contiguous, nd[::-1], PyBUF_READ, 'C')
|
self.assertRaises(ValueError, get_contiguous, nd[::-1], PyBUF_READ, 'C')
|
||||||
|
|
||||||
def test_memoryview_cast_zero_shape(self):
|
def test_memoryview_cast_zero_shape(self):
|
||||||
# Casts are undefined if shape contains zeros. These arrays are
|
# Casts are undefined if buffer is multidimensional and shape
|
||||||
# regarded as C-contiguous by Numpy and PyBuffer_GetContiguous(),
|
# contains zeros. These arrays are regarded as C-contiguous by
|
||||||
# so they are not caught by the test for C-contiguity in memory_cast().
|
# Numpy and PyBuffer_GetContiguous(), so they are not caught by
|
||||||
|
# the test for C-contiguity in memory_cast().
|
||||||
items = [1,2,3]
|
items = [1,2,3]
|
||||||
for shape in ([0,3,3], [3,0,3], [0,3,3]):
|
for shape in ([0,3,3], [3,0,3], [0,3,3]):
|
||||||
ex = ndarray(items, shape=shape)
|
ex = ndarray(items, shape=shape)
|
||||||
self.assertTrue(ex.c_contiguous)
|
self.assertTrue(ex.c_contiguous)
|
||||||
msrc = memoryview(ex)
|
msrc = memoryview(ex)
|
||||||
self.assertRaises(TypeError, msrc.cast, 'c')
|
self.assertRaises(TypeError, msrc.cast, 'c')
|
||||||
|
# Monodimensional empty view can be cast (issue #19014).
|
||||||
|
for fmt, _, _ in iter_format(1, 'memoryview'):
|
||||||
|
msrc = memoryview(b'')
|
||||||
|
m = msrc.cast(fmt)
|
||||||
|
self.assertEqual(m.tobytes(), b'')
|
||||||
|
self.assertEqual(m.tolist(), [])
|
||||||
|
|
||||||
def test_memoryview_struct_module(self):
|
def test_memoryview_struct_module(self):
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,8 @@ What's New in Python 3.3.3 release candidate 1?
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Issue #19014: memoryview.cast() is now allowed on zero-length views.
|
||||||
|
|
||||||
- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
|
- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
|
||||||
absurdly high.
|
absurdly high.
|
||||||
|
|
||||||
|
|
|
@ -1330,7 +1330,7 @@ memory_cast(PyMemoryViewObject *self, PyObject *args, PyObject *kwds)
|
||||||
"memoryview: casts are restricted to C-contiguous views");
|
"memoryview: casts are restricted to C-contiguous views");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (zero_in_shape(self)) {
|
if ((shape || self->view.ndim != 1) && zero_in_shape(self)) {
|
||||||
PyErr_SetString(PyExc_TypeError,
|
PyErr_SetString(PyExc_TypeError,
|
||||||
"memoryview: cannot cast view with zeros in shape or strides");
|
"memoryview: cannot cast view with zeros in shape or strides");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue