summaryrefslogtreecommitdiff
path: root/numpy/core/src
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-07-06 10:43:41 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-07-06 10:43:41 -0600
commit94417e42ee604b22e91e8af627270d4a106d09ee (patch)
tree2b08de10addcb1664c618d7522e2dd4dbb4b0097 /numpy/core/src
parent8dba040fcc26c21c982d162b03948a0b21b65535 (diff)
parent77d62bb551c1bfb4d475fa932b718660b6deadbd (diff)
downloadnumpy-94417e42ee604b22e91e8af627270d4a106d09ee.tar.gz
Merge pull request #4843 from juliantaylor/subclass-writeable
BUG: retain writeable flag when indexing subclasses
Diffstat (limited to 'numpy/core/src')
-rw-r--r--numpy/core/src/multiarray/mapping.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index bf4851519..20488fb85 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -1058,6 +1058,9 @@ array_boolean_subscript(PyArrayObject *self,
Py_DECREF(ret);
return NULL;
}
+ if (_IsWriteable(ret)) {
+ PyArray_ENABLEFLAGS(ret, NPY_ARRAY_WRITEABLE);
+ }
}
return ret;
@@ -1583,6 +1586,9 @@ array_subscript(PyArrayObject *self, PyObject *op)
result = NULL;
goto finish;
}
+ if (_IsWriteable(result)) {
+ PyArray_ENABLEFLAGS(result, NPY_ARRAY_WRITEABLE);
+ }
}
finish: