Refine repr() on builtin container types

Author: BCSharp

src/core/IronPython.StdLib/lib/test/test_defaultdict.py

@@ -157,8 +157,14 @@ def __init__(self):
             def _factory(self):
                 return []
         d = sub()
-        self.assertTrue(repr(d).startswith(
-            "defaultdict(<bound method sub._factory of defaultdict(..."))
+        # IronPython: repr class name change adopted from Python 3.7
+        # original Python 3.4 test:
+        # self.assertTrue(repr(d).startswith(
+        #     "defaultdict(<bound method sub._factory of defaultdict(..."))
+        # Python 3.7 test:
+        self.assertRegex(repr(d),
+            r"sub\(<bound method .*sub\._factory "
+            r"of sub\(\.\.\., \{\}\)>, \{\}\)")
 
         # NOTE: printing a subclass of a builtin type does not call its
         # tp_print slot. So this part is essentially the same test as above.

tests/suite/test_isinstance.py

@@ -988,13 +988,12 @@ class MySet(set): pass
             self.assertEqual(repr(MyBytearray(b'x')), "MyBytearray(b'x')")
             self.assertEqual(repr(MyDeque(['c'])), "MyDeque(['c'])")
             self.assertTrue("MyDefaultDict" in repr(MyDefaultDict(list)))
-            self.assertEqual(repr(MySet()), "MySet()")
         else:
             self.assertEqual(repr(MyArray('b')), "array('b')")
             self.assertEqual(repr(MyBytearray(b'x')), "bytearray(b'x')")
             self.assertEqual(repr(MyDeque(['c'])), "deque(['c'])")
             self.assertTrue("defaultdict" in repr(MyDefaultDict(list)))
-            self.assertEqual(repr(MySet()), "MySet()")
+        self.assertEqual(repr(MySet()), "MySet()")
 
 
 run_test(__name__)