Revert "merging refs/remotes/origin/master into HEAD"

This reverts commit a14dd542532d383610c1b01c5698b137dd058fea, reversing
changes made to 11ee694744f2552d77652ed929fdc2b4ccca6843.

1 files changed, 2 insertions, 12 deletions

diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index 5a8262e0d..f907a3447 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -101,8 +101,8 @@ class TestMaskedArray(TestCase):
             self.assertTrue(isMaskedArray(xm))
             assert_equal(shape(xm), s)
             assert_equal(xm.shape, s)
-            assert_equal(xm.size, reduce(lambda x, y:x * y, s))
-            assert_equal(count(xm), len(m1) - reduce(lambda x, y:x + y, m1))
+            assert_equal(xm.size , reduce(lambda x, y:x * y, s))
+            assert_equal(count(xm) , len(m1) - reduce(lambda x, y:x + y, m1))
             assert_equal(xm, xf)
             assert_equal(filled(xm, 1.e20), xf)
             assert_equal(x, xm)
@@ -1150,19 +1150,9 @@ class TestMaskedArrayArithmetic(TestCase):
 
 
     def test_eq_w_None(self):
-        # With no mask
         a = array([1, 2], mask=False)
         assert_equal(a == None, False)
         assert_equal(a != None, True)
-        # With a partial mask
-        a = array([1, 2], mask=[0, 1])
-        assert_equal(a == None, False)
-        assert_equal(a != None, True)
-        # With total mask
-        a = array([1, 2], mask=True)
-        assert_equal(a == None, False)
-        assert_equal(a != None, True)
-        # As masked
         a = masked
         assert_equal(a == None, masked)