diff options
| author | pierregm <pierregmcode@gmail.com> | 2010-10-12 13:00:49 +0200 |
|---|---|---|
| committer | pierregm <pierregmcode@gmail.com> | 2010-10-12 13:00:49 +0200 |
| commit | b0c993624c87e27dc2a70f93f0ef78bedac3c36c (patch) | |
| tree | 513beeb76704175746ce8982dc90c67d4e99cd0f | |
| parent | 4bbe9a87ff41f8444af73a791482c18995293ddc (diff) | |
| download | numpy-b0c993624c87e27dc2a70f93f0ef78bedac3c36c.tar.gz | |
Revert "merging refs/remotes/origin/master into HEAD"
This reverts commit a14dd542532d383610c1b01c5698b137dd058fea, reversing
changes made to 11ee694744f2552d77652ed929fdc2b4ccca6843.
| -rw-r--r-- | .project | 17 | ||||
| -rw-r--r-- | .pydevproject | 10 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 14 |
3 files changed, 2 insertions, 39 deletions
diff --git a/.project b/.project deleted file mode 100644 index 77e405250..000000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>numpy-git</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.python.pydev.PyDevBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.python.pydev.pythonNature</nature> - </natures> -</projectDescription> diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index 79dde8427..000000000 --- a/.pydevproject +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?eclipse-pydev version="1.0"?> - -<pydev_project> -<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> -<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> -<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> -<path>/numpy-git/src</path> -</pydev_pathproperty> -</pydev_project> 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) |