summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Mariasis <ericmariasis829@gmail.com>2020-02-01 07:47:50 -0500
committerEric Mariasis <ericmariasis829@gmail.com>2020-02-01 07:47:50 -0500
commitea28bc2b84a82a3883e3002f983b076e5bab7ffb (patch)
treecf1e979710daaa389484da6b30c40490f110a667
parent5bb389f9de2ec117c4dca72f5df0cb3952191cfd (diff)
parent60da9eb494c4be5d3a6de2dbb8ad6f329d9ae517 (diff)
downloadnumpy-ea28bc2b84a82a3883e3002f983b076e5bab7ffb.tar.gz
Merge branch 'report_generic' of https://github.com/ericmariasis/numpy into report_generic
* 'report_generic' of https://github.com/ericmariasis/numpy: Update numpy/core/src/multiarray/descriptor.c Update numpy/core/src/multiarray/descriptor.c Update numpy/core/src/multiarray/descriptor.c
-rw-r--r--numpy/core/src/multiarray/descriptor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index c1ca5e15c..5143eb2dc 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -464,7 +464,7 @@ _convert_from_array_descr(PyObject *obj, int align)
}
}
else {
- PyErr_SetString(PyExc_TypeError, "First element of field tuple is neither a tuple nor base string");
+ PyErr_SetString(PyExc_TypeError, "First element of field tuple is neither a tuple nor str");
goto fail;
}
@@ -485,7 +485,7 @@ _convert_from_array_descr(PyObject *obj, int align)
Py_INCREF(name);
}
else {
- PyErr_SetString(PyExc_TypeError, "Field names must be non-empty Unicode strings");
+ PyErr_SetString(PyExc_TypeError, "Field names must be non-empty strings");
goto fail;
}
}
@@ -729,7 +729,7 @@ _convert_from_commastring(PyObject *obj, int align)
PyObject *_numpy_internal;
if (!PyUnicode_Check(obj)) {
- PyErr_SetString(PyExc_TypeError, "Object needs to be a Unicode object");
+ PyErr_SetString(PyExc_TypeError, "Object needs to be a str");
return NULL;
}
_numpy_internal = PyImport_ImportModule("numpy.core._internal");