summaryrefslogtreecommitdiff
path: root/numpy/lib/function_base.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r--numpy/lib/function_base.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 6c7786860..1c67f7c99 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -4272,9 +4272,8 @@ def delete(arr, obj, axis=None):
arr = arr.ravel()
# needed for np.matrix, which is still not 1d after being ravelled
ndim = arr.ndim
- axis = -1
-
- if ndim == 0:
+ axis = ndim - 1
+ elif ndim == 0:
# 2013-09-24, 1.9
warnings.warn(
"in the future the special handling of scalars will be removed "
@@ -4283,8 +4282,8 @@ def delete(arr, obj, axis=None):
return wrap(arr)
else:
return arr.copy(order=arrorder)
-
- axis = normalize_axis_index(axis, ndim)
+ else:
+ axis = normalize_axis_index(axis, ndim)
slobj = [slice(None)]*ndim
N = arr.shape[axis]