diff --git a/.project b/.project
new file mode 100644
index 000000000000..77e405250707
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+
+
+ numpy-git
+
+
+
+
+
+ org.python.pydev.PyDevBuilder
+
+
+
+
+
+ org.python.pydev.pythonNature
+
+
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 000000000000..79dde842742d
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,10 @@
+
+
+
+
+Default
+python 2.7
+
+/numpy-git/src
+
+
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index f907a3447e4c..5a8262e0d50e 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -101,8 +101,8 @@ def test_basic2d(self):
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,9 +1150,19 @@ def test_ne_on_structured(self):
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)