diff options
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/arrayobject.c | 13 | ||||
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 16 |
2 files changed, 14 insertions, 15 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index fe789dee9..ad3cbc4f2 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -11156,7 +11156,7 @@ static PyMemberDef arraydescr_members[] = { {"byteorder", T_CHAR, offsetof(PyArray_Descr, byteorder), RO, NULL}, {"itemsize", T_INT, offsetof(PyArray_Descr, elsize), RO, NULL}, {"alignment", T_INT, offsetof(PyArray_Descr, alignment), RO, NULL}, - {"flags", T_UBYTE, offsetof(PyArray_Descr, flags), RO, NULL}, + {"flags", T_UBYTE, offsetof(PyArray_Descr, hasobject), RO, NULL}, {NULL}, }; @@ -11556,7 +11556,7 @@ arraydescr_reduce(PyArray_Descr *self, PyObject *args) PyTuple_SET_ITEM(state, 5, PyInt_FromLong(elsize)); PyTuple_SET_ITEM(state, 6, PyInt_FromLong(alignment)); - PyTuple_SET_ITEM(state, 7, PyInt_FromLong(self->flags)); + PyTuple_SET_ITEM(state, 7, PyInt_FromLong(self->hasobject)); PyTuple_SET_ITEM(ret, 2, state); return ret; @@ -11568,8 +11568,7 @@ arraydescr_reduce(PyArray_Descr *self, PyObject *args) static int _descr_find_object(PyArray_Descr *self) { - if (PyDataType_FLAGCHK(self, NPY_ITEM_HASOBJECT) || - self->type_num == PyArray_OBJECT || + if (self->hasobject || self->type_num == PyArray_OBJECT || self->kind == 'O') return NPY_OBJECT_DTYPE_FLAGS; if (PyDescr_HASFIELDS(self)) { @@ -11585,7 +11584,7 @@ _descr_find_object(PyArray_Descr *self) return 0; } if (_descr_find_object(new)) { - new->flags = NPY_OBJECT_DTYPE_FLAGS; + new->hasobject = NPY_OBJECT_DTYPE_FLAGS; return NPY_OBJECT_DTYPE_FLAGS; } } @@ -11716,9 +11715,9 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args) self->alignment = alignment; } - self->flags = dtypeflags; + self->hasobject = dtypeflags; if (version < 3) { - self->flags = _descr_find_object(self); + self->hasobject = _descr_find_object(self); } Py_INCREF(Py_None); return Py_None; diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index b556b3c5c..7a5a76123 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -4704,7 +4704,7 @@ _use_inherit(PyArray_Descr *type, PyObject *newobj, int *errflag) new->names = conv->names; Py_XINCREF(new->names); } - new->flags = conv->flags; + new->hasobject = conv->hasobject; Py_DECREF(conv); *errflag = 0; return new; @@ -4783,7 +4783,7 @@ _convert_from_tuple(PyObject *obj) PyDimMem_FREE(shape.ptr); newdescr->subarray = _pya_malloc(sizeof(PyArray_ArrayDescr)); newdescr->subarray->base = type; - newdescr->flags = type->flags; + newdescr->hasobject = type->hasobject; Py_INCREF(val); newdescr->subarray->shape = val; Py_XDECREF(newdescr->fields); @@ -4873,7 +4873,7 @@ _convert_from_array_descr(PyObject *obj, int align) "two fields with the same name"); goto fail; } - dtypeflags |= (conv->flags & NPY_FROM_FIELDS); + dtypeflags |= (conv->hasobject & NPY_FROM_FIELDS); tup = PyTuple_New((title == NULL ? 2 : 3)); PyTuple_SET_ITEM(tup, 0, (PyObject *)conv); if (align) { @@ -4902,7 +4902,7 @@ _convert_from_array_descr(PyObject *obj, int align) new->fields = fields; new->names = nameslist; new->elsize = totalsize; - new->flags=dtypeflags; + new->hasobject=dtypeflags; if (maxalign > 1) { totalsize = ((totalsize+maxalign-1)/maxalign)*maxalign; } @@ -4955,7 +4955,7 @@ _convert_from_list(PyObject *obj, int align) Py_DECREF(key); goto fail; } - dtypeflags |= (conv->flags & NPY_FROM_FIELDS); + dtypeflags |= (conv->hasobject & NPY_FROM_FIELDS); PyTuple_SET_ITEM(tup, 0, (PyObject *)conv); if (align) { int _align; @@ -4973,7 +4973,7 @@ _convert_from_list(PyObject *obj, int align) new = PyArray_DescrNewFromType(PyArray_VOID); new->fields = fields; new->names = nameslist; - new->flags=dtypeflags; + new->hasobject=dtypeflags; if (maxalign > 1) { totalsize = ((totalsize+maxalign-1)/maxalign)*maxalign; } @@ -5199,7 +5199,7 @@ _convert_from_dict(PyObject *obj, int align) } Py_DECREF(tup); if ((ret == PY_FAIL) || (newdescr->elsize == 0)) goto fail; - dtypeflags |= (newdescr->flags & NPY_FROM_FIELDS); + dtypeflags |= (newdescr->hasobject & NPY_FROM_FIELDS); totalsize += newdescr->elsize; } @@ -5217,7 +5217,7 @@ _convert_from_dict(PyObject *obj, int align) } new->names = names; new->fields = fields; - new->flags = dtypeflags; + new->hasobject = dtypeflags; return new; fail: |