From 0ac4d4c82df9c2d629dee9cd388e84b7f08d25fe Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 2 Feb 2010 15:12:42 +0000 Subject: [PATCH] Silence a couple of -3 warnings --- Lib/test/test_unittest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index a0f40f8418f..f24117c7e87 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -3056,7 +3056,7 @@ class Test_Assertions(TestCase): try: self.assertRaises(KeyError, lambda: None) except self.failureException as e: - self.assertIn("KeyError not raised", e) + self.assertIn("KeyError not raised", e.args) else: self.fail("assertRaises() didn't fail") try: @@ -3073,7 +3073,7 @@ class Test_Assertions(TestCase): with self.assertRaises(KeyError): pass except self.failureException as e: - self.assertIn("KeyError not raised", e) + self.assertIn("KeyError not raised", e.args) else: self.fail("assertRaises() didn't fail") try: @@ -3591,6 +3591,9 @@ class TestDiscovery(TestCase): def __eq__(self, other): return self.path == other.path + # Silence py3k warning + __hash__ = None + loader._get_module_from_name = lambda name: Module(name) def loadTestsFromModule(module, use_load_tests): if use_load_tests: