summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 12cdbd68a..f3930eaa9 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -905,7 +905,12 @@ def squeeze(a, axis=None):
squeeze = a.squeeze
except AttributeError:
return _wrapit(a, 'squeeze')
- return squeeze(axis=axis)
+ try:
+ # First try to use the new axis= parameter
+ return squeeze(axis=axis)
+ except TypeError:
+ # For backwards compatibility
+ return squeeze()
def diagonal(a, offset=0, axis1=0, axis2=1):