[Python-checkins] r77911 - python/trunk/Lib/test/test_unittest.py

Tue Feb 2 16:12:42 CET 2010

Author: ezio.melotti
Date: Tue Feb 2 16:12:42 2010
New Revision: 77911
Log:
Silence a couple of -3 warnings
Modified:
 python/trunk/Lib/test/test_unittest.py
Modified: python/trunk/Lib/test/test_unittest.py
==============================================================================

--- python/trunk/Lib/test/test_unittest.py	(original)
+++ python/trunk/Lib/test/test_unittest.py	Tue Feb 2 16:12:42 2010
@@ -3056,7 +3056,7 @@
 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 @@
 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 @@
 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:
