diff options
| -rw-r--r-- | doc/source/reference/c-api.array.rst | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/ctors.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst index f559ddd68..0b1fe18c3 100644 --- a/doc/source/reference/c-api.array.rst +++ b/doc/source/reference/c-api.array.rst @@ -665,7 +665,7 @@ From other objects This function **steals a reference** to ``op`` and makes sure that ``op`` is a base-class ndarray. It special cases array scalars, but otherwise calls :c:func:`PyArray_FromAny` ( ``op``, NULL, 0, 0, - :c:data:`NPY_ARRAY_ENSUREARRAY`). + :c:data:`NPY_ARRAY_ENSUREARRAY`, NULL). .. c:function:: PyObject* PyArray_FromString( \ char* string, npy_intp slen, PyArray_Descr* dtype, npy_intp num, \ diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index f85cf4cbb..298bfcf5d 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -2535,7 +2535,8 @@ PyArray_FromDims(int nd, int *d, int type) /* end old calls */ /*NUMPY_API - * This is a quick wrapper around PyArray_FromAny(op, NULL, 0, 0, ENSUREARRAY) + * This is a quick wrapper around + * PyArray_FromAny(op, NULL, 0, 0, NPY_ARRAY_ENSUREARRAY, NULL) * that special cases Arrays and PyArray_Scalars up front * It *steals a reference* to the object * It also guarantees that the result is PyArray_Type |