diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-09-15 17:24:44 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-09-15 17:24:44 +0000 |
commit | b3a5ff58124174ff9beab9118039b16db8a6b83d (patch) | |
tree | b5d0206561b00c022eeacafa6db9e72265fead98 /numpy/core/src/arrayobject.c | |
parent | ac9c4730ca4650d9cc1ca97323a1b499dab970b1 (diff) | |
download | numpy-b3a5ff58124174ff9beab9118039b16db8a6b83d.tar.gz |
Don't raise errors when setting with a zero-sized array, just exit
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r-- | numpy/core/src/arrayobject.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index a986a5f8d..417b12717 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -6464,10 +6464,7 @@ array_flat_set(PyArrayObject *self, PyObject *val) selfit = (PyArrayIterObject *)PyArray_IterNew((PyObject *)self); if (selfit == NULL) goto exit; - if (arrit->size == 0) { - PyErr_SetString(PyExc_ValueError, "trying to set with 0-sized array"); - goto exit; - } + if (arrit->size == 0) {retval = 0; goto exit;} swap = PyArray_ISNOTSWAPPED(self) != PyArray_ISNOTSWAPPED(arr); copyswap = self->descr->f->copyswap; @@ -9217,11 +9214,7 @@ iter_ass_subscript(PyArrayIterObject *self, PyObject *ind, PyObject *val) if (arrval==NULL) return -1; val_it = (PyArrayIterObject *)PyArray_IterNew(arrval); if (val_it==NULL) goto finish; - if (val_it->size == 0) { - PyErr_SetString(PyExc_ValueError, - "trying to set with zero-sized array"); - goto finish; - } + if (val_it->size == 0) {retval = 0; goto finish;} /* Check for Boolean -- this is first becasue Bool is a subclass of Int */ |