summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorJulian Taylor <juliantaylor108@gmail.com>2016-08-27 11:46:58 +0200
committerGitHub <noreply@github.com>2016-08-27 11:46:58 +0200
commitf12412d41a76821ade845a48076ff5ba5e1a12f8 (patch)
tree9e1cf1d56e33f080090bdf2d12cbbe2da82a0ed9 /numpy/lib
parenteeb4e17a165e90430a01936914afb2bbeb34acc7 (diff)
parent54b68dda8b29e3745b6b0da5f1d6a2b53f29e291 (diff)
downloadnumpy-f12412d41a76821ade845a48076ff5ba5e1a12f8.tar.gz
Merge pull request #7823 from madphysicist/ma-bugs
BUG: Fixed masked array behavior for scalar inputs to np.ma.atleast_*d
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/info.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/info.py b/numpy/lib/info.py
index ca1e72397..141df2ace 100644
--- a/numpy/lib/info.py
+++ b/numpy/lib/info.py
@@ -67,9 +67,9 @@ Shape Manipulation
------------------
================ ===================
squeeze Return a with length-one dimensions removed.
-atleast_1d Force arrays to be > 1D
-atleast_2d Force arrays to be > 2D
-atleast_3d Force arrays to be > 3D
+atleast_1d Force arrays to be >= 1D
+atleast_2d Force arrays to be >= 2D
+atleast_3d Force arrays to be >= 3D
vstack Stack arrays vertically (row on row)
hstack Stack arrays horizontally (column on column)
column_stack Stack 1D arrays as columns into 2D array