Merge pull request numpy#2746 from GaelVaroquaux/fix-470

FIX: base always refers to the original subclass
migueldvb · Dec 4, 2012 · d8370da · d8370da
2 parents d0c0f14 + 69d57d0
commit d8370da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
@@ -103,7 +103,7 @@ PyArray_SetUpdateIfCopyBase(PyArrayObject *arr, PyArrayObject *base)
     /*
      * Unlike PyArray_SetBaseObject, we do not compress the chain of base
      * references.
-    */
+     */
     ((PyArrayObject_fields *)arr)->base = (PyObject *)base;
     PyArray_ENABLEFLAGS(arr, NPY_ARRAY_UPDATEIFCOPY);
     PyArray_CLEARFLAGS(base, NPY_ARRAY_WRITEABLE);
@@ -168,10 +168,10 @@ PyArray_SetBaseObject(PyArrayObject *arr, PyObject *obj)
         if (tmp == NULL) {
             break;
         }
-        /* Stop the collapse for array sub-classes if new base
-         *   would not be of the same type. 
+        /* Stop the collapse new base when the would not be of the same 
+         * type (i.e. different subclass).
          */
-        if (!(PyArray_CheckExact(arr)) & (Py_TYPE(tmp) != Py_TYPE(arr))) {
+        if (Py_TYPE(tmp) != Py_TYPE(arr)) {
             break;
         }
 

diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py
@@ -3,7 +3,7 @@
 import os
 
 from numpy import memmap
-from numpy import arange, allclose
+from numpy import arange, allclose, asarray
 from numpy.testing import *
 
 class TestMemmap(TestCase):
@@ -112,6 +112,8 @@ def test_view(self):
         new2 = new1.view()
         assert(new1.base is fp)
         assert(new2.base is fp)
+        new_array = asarray(fp)
+        assert(new_array.base is fp)
 
 if __name__ == "__main__":
     run_module_suite()