Improve repr string for OrderedSet and RoutingTable (#1236)

Author: robsdedude

src/neo4j/_routing.py

@@ -32,6 +32,13 @@ def __init__(self, elements=()):
         self._current = None
 
     def __repr__(self):
+        return (
+            f"{self.__class__.__name__}(("
+            f"{', '.join(map(repr, self._elements))}"
+            f"))"
+        )
+
+    def __str__(self):
         return f"{{{', '.join(map(repr, self._elements))}}}"
 
     def __contains__(self, element):
@@ -118,10 +125,14 @@ def __init__(self, *, database, routers=(), readers=(), writers=(), ttl=0):
 
     def __repr__(self):
         return (
-            f"RoutingTable(database={self.database!r}, "
-            f"routers={self.routers!r}, readers={self.readers!r}, "
-            f"writers={self.writers!r}, "
-            f"last_updated_time={self.last_updated_time!r}, ttl={self.ttl!r})"
+            "RoutingTable("
+            f"database={self.database!r}, "
+            f"routers={tuple(self.routers)!r}, "
+            f"readers={tuple(self.readers)!r}, "
+            f"writers={tuple(self.writers)!r}, "
+            f"last_updated_time={self.last_updated_time!r}, "
+            f"ttl={self.ttl!r}"
+            ")"
         )
 
     def __contains__(self, address):

tests/unit/common/io/test_routing.py

@@ -58,10 +58,6 @@
 
 
 class TestOrderedSet:
-    def test_should_repr_as_set(self):
-        s = OrderedSet([1, 2, 3])
-        assert repr(s) == "{1, 2, 3}"
-
     def test_should_contain_element(self):
         s = OrderedSet([1, 2, 3])
         assert 2 in s
@@ -134,6 +130,17 @@ def test_should_be_able_to_replace(self):
         s.replace([3, 4, 5])
         assert list(s) == [3, 4, 5]
 
+    def test_repr(self):
+        s = OrderedSet([1, 2, 3, "abc"])
+        expected_repr = "OrderedSet((1, 2, 3, 'abc'))"
+        assert repr(s) == expected_repr
+        assert eval(repr(s)) == s
+
+    def test_str(self):
+        s = OrderedSet([1, 2, 3, "abc"])
+        expected_repr = "{1, 2, 3, 'abc'}"
+        assert str(s) == expected_repr
+
 
 class TestRoutingTableConstruction:
     def test_should_be_initially_stale(self):