summaryrefslogtreecommitdiff
path: root/numpy/core/src/arrayobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r--numpy/core/src/arrayobject.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index ededf70a0..30a791029 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -7819,7 +7819,8 @@ PyArray_FromArray(PyArrayObject *arr, PyArray_Descr *newtype, int flags)
count and return the input */
else {
Py_DECREF(newtype);
- if ((flags & ENSUREARRAY) && !PyArray_CheckExact(arr)) {
+ if ((flags & ENSUREARRAY) &&
+ !PyArray_CheckExact(arr)) {
Py_INCREF(arr->descr);
ret = (PyArrayObject *) \
PyArray_NewFromDescr(&PyArray_Type,
@@ -7840,7 +7841,7 @@ PyArray_FromArray(PyArrayObject *arr, PyArray_Descr *newtype, int flags)
}
/* The desired output type is different than the input
- array type */
+ array type and copy was not specified */
else {
if ((flags & UPDATEIFCOPY) && \
(!PyArray_ISWRITEABLE(arr))) {