Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixup: Mention that it will be a TypeError (Anirudh's review)
  • Loading branch information
seberg committed Sep 3, 2020
commit 3c746b0f60471e20627588c752dd68ad962fb33d
5 changes: 3 additions & 2 deletions numpy/core/src/multiarray/multiarraymodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,10 @@ PyArray_ConcatenateFlattenedArrays(int narrays, PyArrayObject **arrays,
if (casting_not_passed && out_passed) {
/* NumPy 1.19, 2020-04-30 */
Comment thread
seberg marked this conversation as resolved.
Outdated
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 "
Comment thread
seberg marked this conversation as resolved.
Outdated
"`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;
Expand Down