Merge pull request #149 from 87/ref-fix

Bugfix in PyArray_SetBaseObject
numpy · Aug 31, 2011 · 98ccad6 · 98ccad6
2 parents 1af2f37 + e411631
commit 98ccad6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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))