summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Fernandez <jaime.frio@gmail.com>2015-05-05 20:11:35 -0700
committerJaime Fernandez <jaime.frio@gmail.com>2015-05-06 20:16:37 -0700
commit2a13af9d21eb4f7f83580e44586d692cdaa10868 (patch)
treee4cf5b87cad81b7c75b79022c90af71a620f4e1f
parent56e9bd5b5a2fe56621c4cb02ad20e9b6e9c9ee9e (diff)
downloadnumpy-2a13af9d21eb4f7f83580e44586d692cdaa10868.tar.gz
MANT: Remove size from string representation of object dtype
-rw-r--r--numpy/core/src/multiarray/descriptor.c8
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;