.equals should not ignore Variant and Attribute order, fixes #111 (#112)

Also remove .sorting_key, it's not used anymore.

Author: Pike

fluent.syntax/fluent/syntax/ast.py

@@ -183,13 +183,6 @@ def equals(self, other, ignored_fields=['span']):
                 if len(field1) != len(field2):
                     return False
 
-                # Sort elements of order-agnostic fields to ensure the
-                # comparison is order-agnostic as well. Annotations should be
-                # here too but they don't have sorting keys.
-                if key in ('attributes', 'variants'):
-                    field1 = sorted(field1, key=lambda elem: elem.sorting_key)
-                    field2 = sorted(field2, key=lambda elem: elem.sorting_key)
-
                 for elem1, elem2 in zip(field1, field2):
                     if not scalars_equal(elem1, elem2, ignored_fields):
                         return False
@@ -358,10 +351,6 @@ def __init__(self, id, value, **kwargs):
         self.id = id
         self.value = value
 
-    @property
-    def sorting_key(self):
-        return self.id.name
-
 
 class Variant(SyntaxNode):
     def __init__(self, key, value, default=False, **kwargs):
@@ -370,12 +359,6 @@ def __init__(self, key, value, default=False, **kwargs):
         self.value = value
         self.default = default
 
-    @property
-    def sorting_key(self):
-        if isinstance(self.key, NumberLiteral):
-            return self.key.value
-        return self.key.name
-
 
 class NamedArgument(SyntaxNode):
     def __init__(self, name, value, **kwargs):

fluent.syntax/tests/syntax/test_equals.py

@@ -84,7 +84,7 @@ def test_same_junk(self):
         self.assertTrue(message1.equals(message1.clone()))
 
 
-class TestOrderEquals(unittest.TestCase):
+class TestNonEquals(unittest.TestCase):
     def setUp(self):
         self.parser = FluentParser()
 
@@ -103,8 +103,7 @@ def test_attributes(self):
                 .attr1 = Attr1
         """)
 
-        self.assertTrue(message1.equals(message2))
-        self.assertTrue(message2.equals(message1))
+        self.assertFalse(message1.equals(message2))
 
     def test_variants(self):
         message1 = self.parse_ftl_entry("""\
@@ -122,8 +121,7 @@ def test_variants(self):
                 }
         """)
 
-        self.assertTrue(message1.equals(message2))
-        self.assertTrue(message2.equals(message1))
+        self.assertFalse(message1.equals(message2))
 
     def test_variants_with_numbers(self):
         message1 = self.parse_ftl_entry("""\
@@ -141,8 +139,7 @@ def test_variants_with_numbers(self):
                 }
         """)
 
-        self.assertTrue(message1.equals(message2))
-        self.assertTrue(message2.equals(message1))
+        self.assertFalse(message1.equals(message2))
 
 
 class TestEqualWithSpans(unittest.TestCase):