summaryrefslogtreecommitdiff
path: root/numpy/core
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/core
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/core')
-rw-r--r--numpy/core/shape_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py
index 31d7d1c03..2b5110473 100644
--- a/numpy/core/shape_base.py
+++ b/numpy/core/shape_base.py
@@ -146,7 +146,7 @@ def atleast_3d(*arys):
>>> x = np.arange(12.0).reshape(4,3)
>>> np.atleast_3d(x).shape
(4, 3, 1)
- >>> np.atleast_3d(x).base is x
+ >>> np.atleast_3d(x).base is x.base # x is a reshape, so not base itself
True
>>> for arr in np.atleast_3d([1, 2], [[1, 2]], [[[1, 2]]]):