Changeset 1866

Timestamp:

01/10/06 18:17:47 (3 years ago)

Author:

sasha

Message:

implemented a... = v and a[()] = v for zero rank a

Files:

• trunk/numpy/core/src/arrayobject.c (modified) (1 diff)
• trunk/numpy/core/tests/test_multiarray.py (modified) (1 diff)

trunk/numpy/core/src/arrayobject.c

@@ -1939 +1939 @@
-
-        if (self->nd == 0) {
+                if (index == Py_Ellipsis ||
+                    PyTuple_Check(index) && 0 == PyTuple_GET_SIZE(index))
+                        return self->descr->f->setitem(op, self->data, self);
-                PyErr_SetString(PyExc_IndexError, 
-                                "0-d arrays can't be indexed.");

trunk/numpy/core/tests/test_multiarray.py

@@ -97 +97 @@
-        self.failUnlessRaises(IndexError, lambda x: x[array([], int)], b)
-
+    def check_ellipsis_subscript_assignment(self):
+        a,b = self.d
+
+        a[...] = 42
+        self.failUnlessEqual(a, 42)
+        b[...] = ''
+        self.failUnlessEqual(b.item(), '')
+        
+    def check_empty_subscript_assignment(self):
+        a,b = self.d
+
+        a[()] = 42
+        self.failUnlessEqual(a, 42)
+        b[()] = ''
+        self.failUnlessEqual(b.item(), '')
+
+    def check_invalid_subscript_assignment(self):
+        a,b = self.d
+        def assign(x, i, v):
+            x[i] = v
+        self.failUnlessRaises(IndexError, assign, a, 0, 42)
+        self.failUnlessRaises(IndexError, assign, b, 0, '')
+        self.failUnlessRaises(TypeError, assign, a, (), '')
+
+    
+
-if __name__ == "__main__":
-        ScipyTest('numpy.core.multiarray').run()