summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_functools.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_functools.py')
-rw-r--r--Lib/test/test_functools.py35
1 files changed, 13 insertions, 22 deletions
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index ab51a35..e2ab654 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1577,7 +1577,7 @@ class TestSingleDispatch(unittest.TestCase):
m = mro(D, bases)
self.assertEqual(m, [D, c.MutableSequence, c.Sequence,
c.defaultdict, dict, c.MutableMapping,
- c.Mapping, c.Sized, c.Iterable, c.Container,
+ c.Mapping, c.Sized, c.Reversible, c.Iterable, c.Container,
object])
# Container and Callable are registered on different base classes and
@@ -1758,13 +1758,10 @@ class TestSingleDispatch(unittest.TestCase):
c.Container.register(P)
with self.assertRaises(RuntimeError) as re_one:
g(p)
- 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'>")),
- )
+ 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))
+
class Q(c.Sized):
def __len__(self):
return 0
@@ -1790,13 +1787,10 @@ class TestSingleDispatch(unittest.TestCase):
# perspective.
with self.assertRaises(RuntimeError) as re_two:
h(c.defaultdict(lambda: 0))
- 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'>")),
- )
+ 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))
+
class R(c.defaultdict):
pass
c.MutableSequence.register(R)
@@ -1830,13 +1824,10 @@ class TestSingleDispatch(unittest.TestCase):
# There is no preference for registered versus inferred ABCs.
with self.assertRaises(RuntimeError) as re_three:
h(u)
- 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'>")),
- )
+ 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))
+
class V(c.Sized, S):
def __len__(self):
return 0