diff options
| author | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:10:21 +0000 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:10:21 +0000 |
| commit | ee0b81d79edf639ecd0eaeba8f66bd1e4ed398b8 (patch) | |
| tree | 125dc56f0ad9b4cdd831b697f9aa97fab112eec1 | |
| parent | ee96684c96f6ab7c959658d20030efd603ccfafe (diff) | |
| download | numpy-ee0b81d79edf639ecd0eaeba8f66bd1e4ed398b8.tar.gz | |
3K: ENH: on py3k, rename scalar type display names as unicode_ -> str_ and string_ -> bytes_
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index 56343426c..8e705b3ef 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -2912,6 +2912,16 @@ gen_arrtype_subscript(PyObject *self, PyObject *key) } +#define NAME_bool "bool" +#define NAME_void "void" +#if defined(NPY_PY3K) +#define NAME_string "bytes" +#define NAME_unicode "str" +#else +#define NAME_string "string" +#define NAME_unicode "unicode" +#endif + /**begin repeat * #name = bool, string, unicode, void# * #NAME = Bool, String, Unicode, Void# @@ -2924,7 +2934,7 @@ NPY_NO_EXPORT PyTypeObject Py@NAME@ArrType_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ #endif - "numpy.@name@@ex@", /* tp_name*/ + "numpy." NAME_@name@ "@ex@", /* tp_name*/ sizeof(Py@NAME@ScalarObject), /* tp_basicsize*/ 0, /* tp_itemsize */ 0, /* tp_dealloc */ @@ -2979,6 +2989,11 @@ NPY_NO_EXPORT PyTypeObject Py@NAME@ArrType_Type = { }; /**end repeat**/ +#undef NAME_bool +#undef NAME_void +#undef NAME_string +#undef NAME_unicode + /**begin repeat * #NAME = Byte, Short, Int, Long, LongLong, UByte, UShort, UInt, ULong, * ULongLong, Float, Double, LongDouble, Datetime, Timedelta# |