summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2020-05-20 18:55:31 -0500
committerSebastian Berg <sebastian@sipsolutions.net>2020-09-02 20:11:22 -0500
commit3c746b0f60471e20627588c752dd68ad962fb33d (patch)
tree3b7908e037942d57774209f77390e179c907ba1b
parent3cddaa9f6efe8d0975c2754ea8922050f3563acc (diff)
downloadnumpy-3c746b0f60471e20627588c752dd68ad962fb33d.tar.gz
Fixup: Mention that it will be a TypeError (Anirudh's review)
-rw-r--r--numpy/core/src/multiarray/multiarraymodule.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 8e03d76f1..8ff6a4866 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -623,9 +623,10 @@ PyArray_ConcatenateFlattenedArrays(int narrays, PyArrayObject **arrays,
if (casting_not_passed && out_passed) {
/* NumPy 1.19, 2020-04-30 */
if (give_deprecation_warning && DEPRECATE(
- "concatenate with `axis=None` will use same-kind "
+ "concatenate() with `axis=None` will use same-kind "
"casting by default in the future. Please use "
- "`casting='unsafe'` to retain the old behaviour.") < 0) {
+ "`casting='unsafe'` to retain the old behaviour. "
+ "In the future this will be a TypeError.") < 0) {
Py_DECREF(sliding_view);
Py_DECREF(ret);
return NULL;