From e6ea9efa1c0b30eda938cab3983c390c93614554 Mon Sep 17 00:00:00 2001 From: Vighnesh Birodkar Date: Sun, 30 Mar 2014 17:46:45 +0530 Subject: [PATCH] formatting, used assert_equals in test --- skimage/measure/_regionprops.py | 4 ++-- skimage/measure/tests/test_regionprops.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index 4cc3dab5..06840238 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -336,8 +336,8 @@ class _RegionProperties(MutableMapping): for key in PROP_VALS: try: #so that NaNs are equal - np.testing.assert_equal( - getattr(self, key, None), getattr(other, key, None)) + np.testing.assert_equal(getattr(self, key, None), + getattr(other, key, None)) except AssertionError: return False diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py index eea71c5f..b3d2c505 100644 --- a/skimage/measure/tests/test_regionprops.py +++ b/skimage/measure/tests/test_regionprops.py @@ -383,8 +383,8 @@ def test_equals(): r2 = regions[0] r3 = regions[1] - assert r1 == r2 - assert r1 != r3 + assert_equal(r1 == r2, True, "Same regionprops are not equal") + assert_equal(r1 != r3, True, "Different regionprops are equal") if __name__ == "__main__":