10000 BUG: Make PyArray_PutTo respect writeable flag. by charris · Pull Request #5216 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Make PyArray_PutTo respect writeable flag. #5216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2014
Merged

BUG: Make PyArray_PutTo respect writeable flag. #5216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
892c469
BUG: Make PyArray_PutTo respect writeable flag.
jarl-haggerty Sep 27, 2014
b1f8bcf
TST: Add some tests for ndarray.put.
charris Oct 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
10000 Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions numpy/core/src/multiarray/item_selection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,11 @@ PyArray_PutTo(PyArrayObject *self, PyObject* values0, PyObject *indices0,
"put: first argument must be an array");
return NULL;
}

if (PyArray_FailUnlessWriteable(self, "put: output array") < 0) {
return NULL;
}

if (!PyArray_ISCONTIGUOUS(self)) {
PyArrayObject *obj;
int flags = NPY_ARRAY_CARRAY | NPY_ARRAY_UPDATEIFCOPY;
Expand Down
34 changes: 34 additions & 0 deletions numpy/core/tests/test_multiarray.py
View file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,40 @@ def test_diagonal_memleak(self):
a.diagonal()
assert_(sys.getrefcount(a) < 50)

def test_put(self):
icodes = np.typecodes['AllInteger']
fcodes = np.typecodes['AllFloat']
for dt in icodes + fcodes + 'O':
tgt = np.array([0, 1, 0, 3, 0, 5], dtype=dt)

# test 1-d
a = np.zeros(6, dtype=dt)
a.put([1, 3, 5], [1, 3, 5])
assert_equal(a, tgt)

# test 2-d
a = np.zeros((2, 3), dtype=dt)
a.put([1, 3, 5], [1, 3, 5])
assert_equal(a, tgt.reshape(2, 3))

for dt in '?':
tgt = np.array([False, True, False, True, False, True], dtype=dt)

# test 1-d
a = np.zeros(6, dtype=dt)
a.put([1, 3, 5], [True]*3)
assert_equal(a, tgt)

# test 2-d
a = np.zeros((2, 3), dtype=dt)
a.put([1, 3, 5], [True]*3)
assert_equal(a, tgt.reshape(2, 3))

# check must be writeable
a = np.zeros(6)
a.flags.writeable = False
assert_raises(ValueError, a.put, [1, 3, 5], [1, 3, 5])

def test_ravel(self):
a = np.array([[0, 1], [2, 3]])
assert_equal(a.ravel(), [0, 1, 2, 3])
Expand Down
0