diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-05-07 01:18:10 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-05-07 01:18:10 -0400 |
| commit | c48068ee4d2f66a0dff7ed35fac8dd0992adfe44 (patch) | |
| tree | 5d392cf3bd54688b89f6f12964c8a85a6ebccfd2 /numpy | |
| parent | 56e9bd5b5a2fe56621c4cb02ad20e9b6e9c9ee9e (diff) | |
| parent | 498acae7f5746c899013bf9f85412beb26778463 (diff) | |
| download | numpy-c48068ee4d2f66a0dff7ed35fac8dd0992adfe44.tar.gz | |
Merge pull request #5841 from jaimefrio/object_dtype_str
MANT: Remove size from string representation of object dtype
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/descriptor.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index a7953b44d..2bb45a6e0 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -1677,8 +1677,12 @@ arraydescr_protocol_typestr_get(PyArray_Descr *self) if (self->type_num == NPY_UNICODE) { size >>= 2; } - - ret = PyUString_FromFormat("%c%c%d", endian, basic_, size); + if (self->type_num == NPY_OBJECT) { + ret = PyUString_FromFormat("%c%c", endian, basic_); + } + else { + ret = PyUString_FromFormat("%c%c%d", endian, basic_, size); + } if (PyDataType_ISDATETIME(self)) { PyArray_DatetimeMetaData *meta; |