diff options
author | pierregm <pierregm@localhost> | 2008-07-02 21:46:01 +0000 |
---|---|---|
committer | pierregm <pierregm@localhost> | 2008-07-02 21:46:01 +0000 |
commit | 6a4e465bce127b61948301c9de835e7de99b4c29 (patch) | |
tree | 93fc65d6342d56ac1c991c6d26b18bba2f58841b | |
parent | 016b1f61c0a5c2e49ece0b6b1d31daf42bc2d1a7 (diff) | |
download | numpy-6a4e465bce127b61948301c9de835e7de99b4c29.tar.gz |
Corrected a goof in .reshape()
-rw-r--r-- | numpy/ma/core.py | 6 | ||||
-rw-r--r-- | numpy/ma/tests/test_extras.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index d4c0cb359..4c8291a5f 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -2016,9 +2016,9 @@ masked_%(name)s(data = %(data)s, """ result = self._data.reshape(*s).view(type(self)) result._update_from(self) - if result._mask is not nomask: - result._mask = self._mask.copy() - result._mask.shape = result.shape + mask = self._mask + if mask is not nomask: + result._mask = mask.reshape(*s) return result # def resize(self, newshape, refcheck=True, order=False): diff --git a/numpy/ma/tests/test_extras.py b/numpy/ma/tests/test_extras.py index 2d177fbc1..89d4b6db7 100644 --- a/numpy/ma/tests/test_extras.py +++ b/numpy/ma/tests/test_extras.py @@ -51,9 +51,9 @@ class TestAverage(TestCase): assert_equal(average(y, axis=1), [average(x,axis=0), average(x,axis=0) * 2.0]) assert_equal(average(y, None, weights=w2), 20./6.) - assert_equal(average(y, axis=0, weights=w2), + assert_equal(average(y, axis=0, weights=w2), [0.,1.,2.,3.,4.,10.]) - assert_equal(average(y, axis=1), + assert_equal(average(y, axis=1), [average(x,axis=0), average(x,axis=0) * 2.0]) m1 = zeros(6) m2 = [0,0,1,1,0,0] |