Backed out changeset af29d89083b3 (closes #25548) (closes #27498)

1 files changed, 21 insertions, 12 deletions

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index e2ab654..06eacfb 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1758,10 +1758,13 @@ class TestSingleDispatch(unittest.TestCase):
         c.Container.register(P)
         with self.assertRaises(RuntimeError) as re_one:
             g(p)
-        self.assertIn("Ambiguous dispatch:", str(re_one.exception))
-        self.assertIn("<class 'collections.abc.Container'", str(re_one.exception))
-        self.assertIn("<class 'collections.abc.Iterable'", str(re_one.exception))
-
+        self.assertIn(
+            str(re_one.exception),
+            (("Ambiguous dispatch: <class 'collections.abc.Container'> "
+              "or <class 'collections.abc.Iterable'>"),
+             ("Ambiguous dispatch: <class 'collections.abc.Iterable'> "
+              "or <class 'collections.abc.Container'>")),
+        )
         class Q(c.Sized):
             def __len__(self):
                 return 0
@@ -1787,10 +1790,13 @@ class TestSingleDispatch(unittest.TestCase):
         # perspective.
         with self.assertRaises(RuntimeError) as re_two:
             h(c.defaultdict(lambda: 0))
-        self.assertIn("Ambiguous dispatch:", str(re_two.exception))
-        self.assertIn("<class 'collections.abc.Container'", str(re_two.exception))
-        self.assertIn("<class 'collections.abc.Sized'", str(re_two.exception))
-
+        self.assertIn(
+            str(re_two.exception),
+            (("Ambiguous dispatch: <class 'collections.abc.Container'> "
+              "or <class 'collections.abc.Sized'>"),
+             ("Ambiguous dispatch: <class 'collections.abc.Sized'> "
+              "or <class 'collections.abc.Container'>")),
+        )
         class R(c.defaultdict):
             pass
         c.MutableSequence.register(R)
@@ -1824,10 +1830,13 @@ class TestSingleDispatch(unittest.TestCase):
         # There is no preference for registered versus inferred ABCs.
         with self.assertRaises(RuntimeError) as re_three:
             h(u)
-        self.assertIn("Ambiguous dispatch:", str(re_three.exception))
-        self.assertIn("<class 'collections.abc.Container'", str(re_three.exception))
-        self.assertIn("<class 'collections.abc.Sized'", str(re_three.exception))
-
+        self.assertIn(
+            str(re_three.exception),
+            (("Ambiguous dispatch: <class 'collections.abc.Container'> "
+              "or <class 'collections.abc.Sized'>"),
+             ("Ambiguous dispatch: <class 'collections.abc.Sized'> "
+              "or <class 'collections.abc.Container'>")),
+        )
         class V(c.Sized, S):
             def __len__(self):
                 return 0