From 729eaf137593412fd53c818748739b8bec33b065 Mon Sep 17 00:00:00 2001 From: Kit Yan Choi Date: Tue, 12 May 2020 18:05:52 +0100 Subject: [PATCH] Differentiate order in equality --- traits/observers/expression.py | 10 +--------- traits/observers/tests/test_expression.py | 9 --------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/traits/observers/expression.py b/traits/observers/expression.py index 9cd3193f3..d20f889f0 100644 --- a/traits/observers/expression.py +++ b/traits/observers/expression.py @@ -43,21 +43,13 @@ def __eq__(self, other): """ Return true if the other value is an Expression with equivalent content. - e.g. ``(trait("a") | trait("b")) == (trait("b") | trait("a"))`` will - return true. - Returns ------- boolean """ if type(other) is not type(self): return False - self_graphs = self._as_graphs() - other_graphs = other._as_graphs() - return ( - len(self_graphs) == len(other_graphs) - and set(self_graphs) == set(other_graphs) - ) + return self._as_graphs() == other._as_graphs() def __or__(self, expression): """ Create a new expression that matches this expression OR diff --git a/traits/observers/tests/test_expression.py b/traits/observers/tests/test_expression.py index 0c4b6af62..cd085514b 100644 --- a/traits/observers/tests/test_expression.py +++ b/traits/observers/tests/test_expression.py @@ -219,15 +219,6 @@ def test_join_equality_with_then(self): self.assertEqual(combined1, combined2) - def test_or_equality(self): - expr1 = create_expression(1) - expr2 = create_expression(2) - - combined1 = expr1 | expr2 - combined2 = expr2 | expr1 - # order is ignored. - self.assertEqual(combined1, combined2) - def test_equality_different_type(self): expr = create_expression(1) self.assertNotEqual(expr, "1")