diff options
author | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:03:00 +0000 |
---|---|---|
committer | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:03:00 +0000 |
commit | 06fad78714e65de87536a591087d5cf8c6410bce (patch) | |
tree | d0f74e20234c3feb771d51e7cf25690e1dda847f | |
parent | 1c7167378e9f654a80b3cb57b7c0dd7ee573a109 (diff) | |
download | numpy-06fad78714e65de87536a591087d5cf8c6410bce.tar.gz |
3K: BUG: bytes as dtype should map to 1-byte strings, not long
-rw-r--r-- | numpy/core/src/multiarray/descriptor.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index cb48f3c39..f184fca0e 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -1217,15 +1217,9 @@ PyArray_DescrConverter(PyObject *obj, PyArray_Descr **at) else if (obj == (PyObject *)(&PyBool_Type)) { check_num = PyArray_BOOL; } -#if defined(NPY_PY3K) - else if (obj == (PyObject *)(&PyBytes_Type)) { - check_num = PyArray_LONG; - } -#else else if (obj == (PyObject *)(&PyBytes_Type)) { check_num = PyArray_STRING; } -#endif else if (obj == (PyObject *)(&PyUnicode_Type)) { check_num = PyArray_UNICODE; } |