diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-09-12 09:18:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-12 09:18:24 -0600 |
| commit | c7d83e7412169399586272176d5ad839b568ba57 (patch) | |
| tree | 9b84cdfcef43ce0bfad32092bc1678c88aafa536 | |
| parent | bc6000da993399284d2afd4fcfa1e4c4fe0d408e (diff) | |
| parent | a53cb7e1f25132c36beb6f95a91c759847db1a06 (diff) | |
| download | numpy-c7d83e7412169399586272176d5ad839b568ba57.tar.gz | |
Merge pull request #17293 from charris/cleanup-pyustring-check
MAINT: Replace PyUString_Check by PyUnicode_Check.
| -rw-r--r-- | numpy/core/src/multiarray/descriptor.c | 6 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/hashdescr.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index 95597b812..ee05d215e 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -2153,7 +2153,7 @@ arraydescr_names_set(PyArray_Descr *self, PyObject *val) PyObject *item; int valid = 1; item = PySequence_GetItem(val, i); - valid = PyUString_Check(item); + valid = PyUnicode_Check(item); Py_DECREF(item); if (!valid) { PyErr_Format(PyExc_ValueError, @@ -2788,7 +2788,7 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args) for (i = 0; i < PyTuple_GET_SIZE(names); ++i) { name = PyTuple_GET_ITEM(names, i); - if (!PyUString_Check(name)) { + if (!PyUnicode_Check(name)) { names_ok = 0; break; } @@ -3020,7 +3020,7 @@ PyArray_DescrNewByteorder(PyArray_Descr *self, char newendian) if (NPY_TITLE_KEY(key, value)) { continue; } - if (!PyUString_Check(key) || !PyTuple_Check(value) || + if (!PyUnicode_Check(key) || !PyTuple_Check(value) || ((len=PyTuple_GET_SIZE(value)) < 2)) { continue; } diff --git a/numpy/core/src/multiarray/hashdescr.c b/numpy/core/src/multiarray/hashdescr.c index 0b23b6c21..c596a7098 100644 --- a/numpy/core/src/multiarray/hashdescr.c +++ b/numpy/core/src/multiarray/hashdescr.c @@ -132,7 +132,7 @@ static int _array_descr_walk_fields(PyObject *names, PyObject* fields, PyObject* "(Hash) names and fields inconsistent ???"); return -1; } - if (!PyUString_Check(key)) { + if (!PyUnicode_Check(key)) { PyErr_SetString(PyExc_SystemError, "(Hash) key of dtype dict not a string ???"); return -1; |