diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CAPI.txt | 6 | ||||
| -rw-r--r-- | doc/cython/c_numpy.pxd | 3 | ||||
| -rw-r--r-- | doc/numpybook/capi.lyx | 16 | ||||
| -rw-r--r-- | doc/numpybook/comparison/pyrex/c_numpy.pxd | 3 | ||||
| -rw-r--r-- | doc/pyrex/c_numpy.pxd | 3 | ||||
| -rw-r--r-- | doc/source/reference/c-api.types-and-structures.rst | 7 |
6 files changed, 25 insertions, 13 deletions
diff --git a/doc/CAPI.txt b/doc/CAPI.txt index 28738635e..41241ce5a 100644 --- a/doc/CAPI.txt +++ b/doc/CAPI.txt @@ -61,9 +61,9 @@ This is a very flexible function. ``subtype`` : ``PyTypeObject *`` The subtype that should be created (either pass in - ``&PyArray_Type``, ``&PyBigArray_Type``, or ``obj->ob_type``, + ``&PyArray_Type``, or ``obj->ob_type``, where ``obj`` is a an instance of a subtype (or subclass) of - ``PyArray_Type`` or ``PyBigArray_Type``). + ``PyArray_Type``). ``descr`` : ``PyArray_Descr *`` The type descriptor for the array. This is a Python object (this @@ -114,7 +114,7 @@ This is a very flexible function. order array. See below for an explanation of the flags. ``obj`` : ``PyObject *`` - If subtypes is ``&PyArray_Type`` or ``&PyBigArray_Type``, this argument is + If subtypes is ``&PyArray_Type``, this argument is ignored. Otherwise, the ``__array_finalize__`` method of the subtype is called (if present) and passed this object. This is usually an array of the type to be created (so the ``__array_finalize__`` method diff --git a/doc/cython/c_numpy.pxd b/doc/cython/c_numpy.pxd index 4a0bd1c01..e178b8e33 100644 --- a/doc/cython/c_numpy.pxd +++ b/doc/cython/c_numpy.pxd @@ -76,7 +76,8 @@ cdef extern from "numpy/arrayobject.h": ctypedef extern class numpy.dtype [object PyArray_Descr]: cdef int type_num, elsize, alignment - cdef char type, kind, byteorder, hasobject + cdef char type, kind, byteorder + cdef int flags cdef object fields, typeobj ctypedef extern class numpy.ndarray [object PyArrayObject]: diff --git a/doc/numpybook/capi.lyx b/doc/numpybook/capi.lyx index 04522d13d..72f18ca31 100644 --- a/doc/numpybook/capi.lyx +++ b/doc/numpybook/capi.lyx @@ -599,7 +599,15 @@ char \emph on char \emph default - hasobject; + unused; +\end_layout + +\begin_layout LyX-Code + +\emph on +int +\emph default + flags; \end_layout \begin_layout LyX-Code @@ -674,9 +682,9 @@ NPY_USE_SETITEM \family default flags should be set in the \family typewriter -hasobject +flags \family default - flag. + member. \end_layout \begin_layout Description @@ -702,7 +710,7 @@ ndian), '=' (native), '|' (irrelevant, ignore). \end_layout \begin_layout Description -hasobject A data-type bit-flag that determines if the data-type exhibits +flags A data-type bit-flag that determines if the data-type exhibits object-array like behavior. Each bit in this member is a flag which are named as: \end_layout diff --git a/doc/numpybook/comparison/pyrex/c_numpy.pxd b/doc/numpybook/comparison/pyrex/c_numpy.pxd index e772f6fee..66e77e294 100644 --- a/doc/numpybook/comparison/pyrex/c_numpy.pxd +++ b/doc/numpybook/comparison/pyrex/c_numpy.pxd @@ -73,7 +73,8 @@ cdef extern from "numpy/arrayobject.h": ctypedef extern class numpy.dtype [object PyArray_Descr]: cdef int type_num, elsize, alignment - cdef char type, kind, byteorder, hasobject + cdef char type, kind, byteorder + cdef int flags cdef object fields, typeobj ctypedef extern class numpy.ndarray [object PyArrayObject]: diff --git a/doc/pyrex/c_numpy.pxd b/doc/pyrex/c_numpy.pxd index 511acc4b1..8064091e0 100644 --- a/doc/pyrex/c_numpy.pxd +++ b/doc/pyrex/c_numpy.pxd @@ -75,7 +75,8 @@ cdef extern from "numpy/arrayobject.h": ctypedef extern class numpy.dtype [object PyArray_Descr]: cdef int type_num, elsize, alignment - cdef char type, kind, byteorder, hasobject + cdef char type, kind, byteorder + cdef int flags cdef object fields, typeobj ctypedef extern class numpy.ndarray [object PyArrayObject]: diff --git a/doc/source/reference/c-api.types-and-structures.rst b/doc/source/reference/c-api.types-and-structures.rst index ece7f341b..8fe698c9b 100644 --- a/doc/source/reference/c-api.types-and-structures.rst +++ b/doc/source/reference/c-api.types-and-structures.rst @@ -191,7 +191,8 @@ PyArrayDescr_Type char kind; char type; char byteorder; - char hasobject; + char unused; + int flags; int type_num; int elsize; int alignment; @@ -208,7 +209,7 @@ PyArrayDescr_Type should point to a user-defined typeobject. This typeobject can either inherit from array scalars or not. If it does not inherit from array scalars, then the :cdata:`NPY_USE_GETITEM` and - :cdata:`NPY_USE_SETITEM` flags should be set in the ``hasobject`` flag. + :cdata:`NPY_USE_SETITEM` flags should be set in the ``flags`` member. .. cmember:: char PyArray_Descr.kind @@ -229,7 +230,7 @@ PyArrayDescr_Type endian), '=' (native), '\|' (irrelevant, ignore). All builtin data- types have byteorder '='. -.. cmember:: char PyArray_Descr.hasobject +.. cmember:: int PyArray_Descr.flags A data-type bit-flag that determines if the data-type exhibits object- array like behavior. Each bit in this member is a flag which are named |