mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 07:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Silence a couple of -3 warnings

Browse source
This commit is contained in:
Ezio Melotti 2010-02-02 15:12:42 +00:00
parent 5d62cfe070
commit 0ac4d4c82d
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_unittest.py
View file

@ -3056,7 +3056,7 @@ class Test_Assertions(TestCase):
try: try:
self.assertRaises(KeyError, lambda: None) self.assertRaises(KeyError, lambda: None)
except self.failureException as e: except self.failureException as e:
self.assertIn("KeyError not raised", e) self.assertIn("KeyError not raised", e.args)
else: else:
self.fail("assertRaises() didn't fail") self.fail("assertRaises() didn't fail")
try: try:
@ -3073,7 +3073,7 @@ class Test_Assertions(TestCase):
with self.assertRaises(KeyError): with self.assertRaises(KeyError):
pass pass
except self.failureException as e: except self.failureException as e:
self.assertIn("KeyError not raised", e) self.assertIn("KeyError not raised", e.args)
else: else:
self.fail("assertRaises() didn't fail") self.fail("assertRaises() didn't fail")
try: try:
@ -3591,6 +3591,9 @@ class TestDiscovery(TestCase):
def __eq__(self, other): def __eq__(self, other):
return self.path == other.path return self.path == other.path
# Silence py3k warning
__hash__ = None
loader._get_module_from_name = lambda name: Module(name) loader._get_module_from_name = lambda name: Module(name)
def loadTestsFromModule(module, use_load_tests): def loadTestsFromModule(module, use_load_tests):
if use_load_tests: if use_load_tests: