Silence a couple of -3 warnings

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index a0f40f8418fe4d482a559062a3b0dae10fba5e49..f24117c7e87e28fe068a35acbfe42c12eadb5bb8 100644 (file)
--- 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: