diff options
author | Eric Wieser <wieser.eric@gmail.com> | 2020-03-24 13:30:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-24 13:30:19 +0000 |
commit | 7d0b3efe4b38fb5b5ba7367741b55d7655037ad0 (patch) | |
tree | 52510609bfb3698af07468c65efff570ddc5d999 /numpy/lib/function_base.py | |
parent | b3f41eeafd2708a6b519cf3c7ba3576dfa1cc5b3 (diff) | |
parent | f0e37e8088e55307ad33791a03cb3989f1b8118c (diff) | |
download | numpy-7d0b3efe4b38fb5b5ba7367741b55d7655037ad0.tar.gz |
Merge pull request #15802 from eric-wieser/simplify-insert
DEP: Make `np.insert` and `np.delete` on 0d arrays with an axis an error
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r-- | numpy/lib/function_base.py | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index a49c34741..7211b68cf 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -4273,15 +4273,6 @@ def delete(arr, obj, axis=None): # needed for np.matrix, which is still not 1d after being ravelled ndim = arr.ndim axis = ndim - 1 - elif ndim == 0: - # 2013-09-24, 1.9 - warnings.warn( - "in the future the special handling of scalars will be removed " - "from delete and raise an error", DeprecationWarning, stacklevel=3) - if wrap: - return wrap(arr) - else: - return arr.copy(order=arrorder) else: axis = normalize_axis_index(axis, ndim) @@ -4490,17 +4481,6 @@ def insert(arr, obj, values, axis=None): # needed for np.matrix, which is still not 1d after being ravelled ndim = arr.ndim axis = ndim - 1 - elif ndim == 0: - # 2013-09-24, 1.9 - warnings.warn( - "in the future the special handling of scalars will be removed " - "from insert and raise an error", DeprecationWarning, stacklevel=3) - arr = arr.copy(order=arrorder) - arr[...] = values - if wrap: - return wrap(arr) - else: - return arr else: axis = normalize_axis_index(axis, ndim) slobj = [slice(None)]*ndim |