diff options
| author | 87 <hangenuit@gmail.com> | 2011-08-30 21:44:54 +0200 |
|---|---|---|
| committer | 87 <hangenuit@gmail.com> | 2011-08-31 00:25:18 +0200 |
| commit | e411631e136bcdf53ef421102d8cb989beaacf08 (patch) | |
| tree | 4807a02ef44331ccafebf577cfb6233c3f576883 | |
| parent | 9ecd91b7bf8c77d696ec9856ba10896d8f60309a (diff) | |
| download | numpy-e411631e136bcdf53ef421102d8cb989beaacf08.tar.gz | |
BUG: PyArray_SetBaseObject didn't set proper base when collapsing views
| -rw-r--r-- | numpy/core/src/multiarray/arrayobject.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_maskna.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c index f79bf1737..27f2b7ef5 100644 --- a/numpy/core/src/multiarray/arrayobject.c +++ b/numpy/core/src/multiarray/arrayobject.c @@ -102,7 +102,7 @@ PyArray_SetBaseObject(PyArrayObject *arr, PyObject *obj) * its own data. */ while (PyArray_Check(obj) && (PyObject *)arr != obj) { - PyArrayObject *obj_arr = (PyArrayObject *)arr; + PyArrayObject *obj_arr = (PyArrayObject *)obj; PyObject *tmp; /* If this array owns its own data, stop collapsing */ diff --git a/numpy/core/tests/test_maskna.py b/numpy/core/tests/test_maskna.py index bbda9f5fa..6d7ded27a 100644 --- a/numpy/core/tests/test_maskna.py +++ b/numpy/core/tests/test_maskna.py @@ -481,7 +481,7 @@ def test_array_maskna_array_function_1D(): # Should produce a view with an owned mask with 'ownmaskna=True' c = np.array(b_view, copy=False, ownmaskna=True) - assert_(c.base is b_view) + assert_(c.base is b_view.base) assert_(c.flags.ownmaskna) assert_(not (c is b_view)) |