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

sasha · sasha · commit 743d922bf589 · 2006-01-11T00:17:47.000Z
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
@@ -1938,6 +1938,9 @@ array_ass_sub(PyArrayObject *self, PyObject *index, PyObject *op)
 	}
 
         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.");
                 return -1;
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
@@ -96,5 +96,31 @@ def check_invalid_subscript(self):
         self.failUnlessRaises(IndexError, lambda x: x[array([], int)], a)
         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()

Original file line number	Diff line number	Diff line change
`@@ -1938,6 +1938,9 @@ array_ass_sub(PyArrayObject self, PyObject index, PyObject *op)`
`1938`	`1938`	`}`
`1939`	`1939`
`1940`	`1940`	`if (self->nd == 0) {`
	`1941`	`+ if (index == Py_Ellipsis \|\|`
	`1942`	`+ PyTuple_Check(index) && 0 == PyTuple_GET_SIZE(index))`
	`1943`	`+ return self->descr->f->setitem(op, self->data, self);`
`1941`	`1944`	`PyErr_SetString(PyExc_IndexError,`
`1942`	`1945`	`"0-d arrays can't be indexed.");`
`1943`	`1946`	`return -1;`