summaryrefslogtreecommitdiff
path: root/numpy/core/src/arrayobject.c
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-03-31 08:32:04 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-03-31 08:32:04 +0000
commitda78766309515905b4016ac494dac384fe80a5fd (patch)
tree0e62798744fb6f3aafd85bfca676f625e5d02b73 /numpy/core/src/arrayobject.c
parent698a593861f8a9c4f2346e456eee978393bf5595 (diff)
downloadnumpy-da78766309515905b4016ac494dac384fe80a5fd.tar.gz
Fix-up record-array pickling and attribute access errors. Fix minor pickling inconsistency with un-ordered ('|') data-types.
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r--numpy/core/src/arrayobject.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 55254b5e9..f82cc8d57 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -8774,7 +8774,8 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
if (!PyArg_ParseTuple(args, "(cOOii)", &endian, &subarray, &fields,
&elsize, &alignment)) return NULL;
- if (PyArray_IsNativeByteOrder(endian)) endian = '=';
+ if (endian != '|' &&
+ PyArray_IsNativeByteOrder(endian)) endian = '=';
self->byteorder = endian;
if (self->subarray) {