From 0d4b5afb340b0e0d758f44f099e23db8b4484260 Mon Sep 17 00:00:00 2001 From: Eric Mariasis Date: Sat, 1 Feb 2020 07:23:17 -0500 Subject: Update numpy/core/src/multiarray/descriptor.c Co-Authored-By: Eric Wieser --- numpy/core/src/multiarray/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/core/src') diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index 9e5cdb42f..8691191ef 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -727,7 +727,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"); -- cgit v1.2.1 From 46428cc284ffcfbe83527ddb7e614c9a63e50fbb Mon Sep 17 00:00:00 2001 From: Eric Mariasis Date: Sat, 1 Feb 2020 07:23:40 -0500 Subject: Update numpy/core/src/multiarray/descriptor.c Co-Authored-By: Eric Wieser --- numpy/core/src/multiarray/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/core/src') diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index 8691191ef..d761acd4a 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -483,7 +483,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; } } -- cgit v1.2.1 From 60da9eb494c4be5d3a6de2dbb8ad6f329d9ae517 Mon Sep 17 00:00:00 2001 From: Eric Mariasis Date: Sat, 1 Feb 2020 07:24:07 -0500 Subject: Update numpy/core/src/multiarray/descriptor.c Co-Authored-By: Eric Wieser --- numpy/core/src/multiarray/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/core/src') diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index d761acd4a..d9098024d 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -462,7 +462,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; } -- cgit v1.2.1