diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-02-07 07:08:26 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-02-07 07:08:26 +0000 |
| commit | 5b8f347d93cc675edac0909b326e8b6b962f16d4 (patch) | |
| tree | b9ab049eb0ff45ff9726255e7f62733cd559d8c0 /numpy/core/src/arrayobject.c | |
| parent | 79f73f394f16f03e335e215383abf03e93a88794 (diff) | |
| download | numpy-5b8f347d93cc675edac0909b326e8b6b962f16d4.tar.gz | |
Make unicode use w or W on output.
Diffstat (limited to 'numpy/core/src/arrayobject.c')
| -rw-r--r-- | numpy/core/src/arrayobject.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index bf8998c7d..2444551c7 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -5830,13 +5830,22 @@ _array_typedescr_fromstr(char *str) if (size == sizeof(PyObject *)) type_num = PyArray_OBJECT; else _MY_FAIL - break; - case 'S': + break; + case PyArray_STRINGLTR: type_num = PyArray_STRING; break; - case 'U': + case PyArray_UNICODELTR: type_num = PyArray_UNICODE; + size *= sizeof(Py_UNICODE); break; + case PyArray_UCS2LTR: + if (sizeof(Py_UNICODE) != 2) _MY_FAIL + type_num = PyArray_UNICODE; + break; + case PyArray_UCS4LTR: + if (sizeof(Py_UNICODE) != 4) _MY_FAIL + type_num = PyArray_UNICODE; + break; case 'V': type_num = PyArray_VOID; break; @@ -8147,7 +8156,7 @@ arraydescr_protocol_typestr_get(PyArray_Descr *self) endian = '<'; if (!PyArray_IsNativeByteOrder(endian)) endian = '>'; } - + return PyString_FromFormat("%c%c%d", endian, basic_, self->elsize); } |