Make deprecation messages more informative.

2 files changed, 6 insertions, 12 deletions

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 2b4ec2ea9..9ea986297 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -1313,11 +1313,9 @@ PyArray_FromDimsAndDataAndDescr(int nd, int *d,
     PyObject *ret;
     int i;
     intp newd[MAX_DIMS];
-    char msg[] = "PyArray_FromDimsAndDataAndDescr";
-    int err;
+    char msg[] = "PyArray_FromDimsAndDataAndDescr: use PyArray_NewFromDescr.";
 
-    err = DEPRECATE(msg);
-    if (err < 0) {
+    if (DEPRECATE(msg) < 0) {
         return NULL;
     }
     if (!PyArray_ISNBO(descr->byteorder))
@@ -1339,11 +1337,9 @@ static PyObject *
 PyArray_FromDims(int nd, int *d, int type)
 {
     PyObject *ret;
-    char msg[] = "PyArray_FromDims";
-    int err;
+    char msg[] = "PyArray_FromDims: use PyArray_SimpleNew.";
 
-    err = DEPRECATE(msg);
-    if (err < 0) {
+    if (DEPRECATE(msg) < 0) {
         return NULL;
     }
     ret = PyArray_FromDimsAndDataAndDescr(nd, d,
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
index e4218e65c..e8cd9108d 100644
--- a/numpy/core/src/multiarraymodule.c
+++ b/numpy/core/src/multiarraymodule.c
@@ -1665,11 +1665,9 @@ PyArray_As1D(PyObject **op, char **ptr, int *d1, int typecode)
 {
     intp newd1;
     PyArray_Descr *descr;
-    int err;
-    char msg[] = "PyArray_As1D: use PyArray_AsCArray instead.";
+    char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
 
-    err = DEPRECATE(msg);
-    if (err < 0) {
+    if (DEPRECATE(msg) < 0) {
         return -1;
     }
     descr = PyArray_DescrFromType(typecode);