summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2018-06-03 17:43:29 -0700
committerEric Wieser <wieser.eric@gmail.com>2018-06-03 17:43:29 -0700
commit40e79aef2c874ec113c20f730bfbda882cf28d9a (patch)
tree980e367930000979a3342ce8c16b1f9c4334299d /numpy/core
parent2e60274cb8cbdad77abb81b48c2fb92e449db23e (diff)
downloadnumpy-40e79aef2c874ec113c20f730bfbda882cf28d9a.tar.gz
MAINT: Don't update the flags a second time
`PyArray_UpdateFlags(view, NPY_ARRAY_UPDATE_ALL);` is already called within PyArray_NewFromDescr_int
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/src/multiarray/ctors.c3
-rw-r--r--numpy/core/src/multiarray/methods.c2
-rw-r--r--numpy/core/src/multiarray/nditer_api.c2
-rw-r--r--numpy/core/src/multiarray/nditer_constr.c3
-rw-r--r--numpy/core/src/multiarray/nditer_pywrap.c4
5 files changed, 0 insertions, 14 deletions
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index 5d3cee647..b34f0b706 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -1358,8 +1358,6 @@ _array_from_buffer_3118(PyObject *memoryview)
if (PyArray_SetBaseObject((PyArrayObject *)r, memoryview) < 0) {
goto fail;
}
- PyArray_UpdateFlags((PyArrayObject *)r, NPY_ARRAY_UPDATE_ALL);
-
return r;
fail:
@@ -2124,7 +2122,6 @@ PyArray_FromStructInterface(PyObject *input)
return NULL;
}
Py_DECREF(attr);
- PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL);
return (PyObject *)ret;
fail:
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index 004af8a70..ed339b98d 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -388,8 +388,6 @@ PyArray_GetField(PyArrayObject *self, PyArray_Descr *typed, int offset)
Py_DECREF(ret);
return NULL;
}
-
- PyArray_UpdateFlags((PyArrayObject *)ret, NPY_ARRAY_UPDATE_ALL);
return ret;
}
diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c
index 152955940..28020f79a 100644
--- a/numpy/core/src/multiarray/nditer_api.c
+++ b/numpy/core/src/multiarray/nditer_api.c
@@ -1153,8 +1153,6 @@ NpyIter_GetIterView(NpyIter *iter, npy_intp i)
Py_DECREF(view);
return NULL;
}
- /* Make sure all the flags are good */
- PyArray_UpdateFlags(view, NPY_ARRAY_UPDATE_ALL);
return view;
}
diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c
index c512cf208..b07137858 100644
--- a/numpy/core/src/multiarray/nditer_constr.c
+++ b/numpy/core/src/multiarray/nditer_constr.c
@@ -2675,9 +2675,6 @@ npyiter_new_temp_array(NpyIter *iter, PyTypeObject *subtype,
return NULL;
}
- /* Make sure all the flags are good */
- PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL);
-
/* Double-check that the subtype didn't mess with the dimensions */
if (subtype != &PyArray_Type) {
if (PyArray_NDIM(ret) != op_ndim ||
diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c
index 4505e645b..50a138167 100644
--- a/numpy/core/src/multiarray/nditer_pywrap.c
+++ b/numpy/core/src/multiarray/nditer_pywrap.c
@@ -2077,8 +2077,6 @@ npyiter_seq_item(NewNpyArrayIterObject *self, Py_ssize_t i)
return NULL;
}
- PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL);
-
return (PyObject *)ret;
}
@@ -2216,8 +2214,6 @@ npyiter_seq_ass_item(NewNpyArrayIterObject *self, Py_ssize_t i, PyObject *v)
return -1;
}
- PyArray_UpdateFlags(tmp, NPY_ARRAY_UPDATE_ALL);
-
ret = PyArray_CopyObject(tmp, v);
Py_DECREF(tmp);
return ret;