diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2020-09-10 17:21:18 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2020-09-10 17:51:51 -0600 |
commit | 920afc720abe5065e164d14fd732a4b5e8fdc359 (patch) | |
tree | 3a0553054a1c8d332fc51e938a9b07b5409d04b4 | |
parent | f34c7c6b0edb8bb3044867d5984dfd607fe9f5b9 (diff) | |
download | numpy-920afc720abe5065e164d14fd732a4b5e8fdc359.tar.gz |
MAINT: Replace PyString_Type with PyBytes_Type.
This replaces the npy_3kcompat PyString_Type macro with its definition.
-rw-r--r-- | numpy/core/src/multiarray/dtypemeta.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/src/multiarray/dtypemeta.c b/numpy/core/src/multiarray/dtypemeta.c index 3026e68e9..d07dc700d 100644 --- a/numpy/core/src/multiarray/dtypemeta.c +++ b/numpy/core/src/multiarray/dtypemeta.c @@ -253,7 +253,7 @@ datetime_known_scalar_types( * must take charge. Otherwise we would attempt casting which does not * truly support this. Only object arrays are special cased in this way. */ - return (PyType_IsSubtype(pytype, &PyString_Type) || + return (PyType_IsSubtype(pytype, &PyBytes_Type) || PyType_IsSubtype(pytype, &PyUnicode_Type)); } diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 276ceabc4..5d26843a4 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -3876,7 +3876,7 @@ _vec_string(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUSED(kw } if (PyArray_TYPE(char_array) == NPY_STRING) { - method = PyObject_GetAttr((PyObject *)&PyString_Type, method_name); + method = PyObject_GetAttr((PyObject *)&PyBytes_Type, method_name); } else if (PyArray_TYPE(char_array) == NPY_UNICODE) { method = PyObject_GetAttr((PyObject *)&PyUnicode_Type, method_name); @@ -4337,7 +4337,7 @@ setup_scalartypes(PyObject *NPY_UNUSED(dict)) if (PyType_Ready(&PyComplex_Type) < 0) { return -1; } - if (PyType_Ready(&PyString_Type) < 0) { + if (PyType_Ready(&PyBytes_Type) < 0) { return -1; } if (PyType_Ready(&PyUnicode_Type) < 0) { |