diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-08-18 06:38:46 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-08-18 06:38:46 (GMT) |
commit | 8e205f7b4f852d903db223d98b96721c4bc19644 (patch) | |
tree | 6336379f72cf13fcefa75a23990fc5cdc92d29c1 /Doc/c-api | |
parent | 80ac11f95f1c6b3f11f25de074a2d6eb1e261dc2 (diff) | |
parent | 2053aa119318c6bc931fff1cd76c1ab624e49232 (diff) | |
download | cpython-8e205f7b4f852d903db223d98b96721c4bc19644.zip cpython-8e205f7b4f852d903db223d98b96721c4bc19644.tar.gz cpython-8e205f7b4f852d903db223d98b96721c4bc19644.tar.bz2 |
merge 3.4 (#24883)
Diffstat (limited to 'Doc/c-api')
-rw-r--r-- | Doc/c-api/buffer.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst index 6cb474e..46c19d3 100644 --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@ -133,15 +133,15 @@ a buffer, see :c:func:`PyObject_GetBuffer`. called on non-NULL :c:member:`~Py_buffer.format` values. Important exception: If a consumer requests a buffer without the - :c:macro:`PyBUF_FORMAT` flag, :c:member:`~Py_Buffer.format` will + :c:macro:`PyBUF_FORMAT` flag, :c:member:`~Py_buffer.format` will be set to *NULL*, but :c:member:`~Py_buffer.itemsize` still has the value for the original format. - If :c:member:`~Py_Buffer.shape` is present, the equality + If :c:member:`~Py_buffer.shape` is present, the equality ``product(shape) * itemsize == len`` still holds and the consumer can use :c:member:`~Py_buffer.itemsize` to navigate the buffer. - If :c:member:`~Py_Buffer.shape` is *NULL* as a result of a :c:macro:`PyBUF_SIMPLE` + If :c:member:`~Py_buffer.shape` is *NULL* as a result of a :c:macro:`PyBUF_SIMPLE` or a :c:macro:`PyBUF_WRITABLE` request, the consumer must disregard :c:member:`~Py_buffer.itemsize` and assume ``itemsize == 1``. @@ -156,7 +156,7 @@ a buffer, see :c:func:`PyObject_GetBuffer`. .. c:member:: int ndim The number of dimensions the memory represents as an n-dimensional array. - If it is 0, :c:member:`~Py_Buffer.buf` points to a single item representing + If it is 0, :c:member:`~Py_buffer.buf` points to a single item representing a scalar. In this case, :c:member:`~Py_buffer.shape`, :c:member:`~Py_buffer.strides` and :c:member:`~Py_buffer.suboffsets` MUST be *NULL*. |