diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2015-05-14 23:24:03 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-06-13 12:56:38 -0600 |
| commit | c65a7518537a6ad53146c6479dd10de28311460e (patch) | |
| tree | 2311ce83cb4643ef23f7b16ead52991d95147929 /numpy | |
| parent | 6bf0e419dc79ea6815557c57b7e9bb504ba20543 (diff) | |
| download | numpy-c65a7518537a6ad53146c6479dd10de28311460e.tar.gz | |
MAINT: make the deprecation warnings a little more distinctive
This is probably a good change in any case, and in particular might
help with debugging whatever bizarro thing is going wrong on Travis.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/arrayobject.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c index 6a22cd141..e7db43c06 100644 --- a/numpy/core/src/multiarray/arrayobject.c +++ b/numpy/core/src/multiarray/arrayobject.c @@ -1370,7 +1370,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op) if (array_other == NULL) { PyErr_Clear(); if (DEPRECATE( - "elementwise comparison failed and returning scalar " + "elementwise == comparison failed and returning scalar " "instead; this will raise an error in the future.") < 0) { return NULL; } @@ -1384,7 +1384,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op) if (_res == 0) { Py_DECREF(array_other); if (DEPRECATE_FUTUREWARNING( - "elementwise comparison failed and returning scalar " + "elementwise == comparison failed and returning scalar " "instead; this will raise an error or perform " "elementwise comparison in the future.") < 0) { return NULL; @@ -1418,7 +1418,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op) * is not possible. */ PyErr_Clear(); - if (DEPRECATE("elementwise comparison failed; " + if (DEPRECATE("elementwise == comparison failed; " "this will raise an error in the future.") < 0) { return NULL; } @@ -1454,7 +1454,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op) if (array_other == NULL) { PyErr_Clear(); if (DEPRECATE( - "elementwise comparison failed and returning scalar " + "elementwise != comparison failed and returning scalar " "instead; this will raise an error in the future.") < 0) { return NULL; } @@ -1468,7 +1468,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op) if (_res == 0) { Py_DECREF(array_other); if (DEPRECATE_FUTUREWARNING( - "elementwise comparison failed and returning scalar " + "elementwise != comparison failed and returning scalar " "instead; this will raise an error or perform " "elementwise comparison in the future.") < 0) { return NULL; @@ -1496,7 +1496,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op) * is not possible. */ PyErr_Clear(); - if (DEPRECATE("elementwise comparison failed; " + if (DEPRECATE("elementwise != comparison failed; " "this will raise an error in the future.") < 0) { return NULL; } |